Bug 967504 - web console now properly handling app creation timeout
fix phpMyAdmin config file

Fixes bug 974899
https://bugzilla.redhat.com/show_bug.cgi?id=974899
Bug 967504 - handling timeout
Bug 967504 - tests
Bug 967504 - proper timeout
Proper timeout error message
Handling nil exception message
Now redirecting to My Applications when app creation times out
More assertions on app creation timeout tests
Bug 976173 - oo-* scripts fail on node with ruby LoadError
The console tabs are slightly misaligned
Bug 975708: Fix java7 marker regression
Merge pull request #2910 from brenton/BZ976173

Merged by openshift-bot
Merge pull request #2911 from smarterclayton/console_tabs_off_kilter

Merged by openshift-bot
Merge pull request #2900 from fabianofranz/master

Merged by openshift-bot
Merge pull request #2899 from VojtechVitek/bz974899_phpmyadmin_config_2

Merged by openshift-bot
<common> bug 976173 oo-diagnostics requires bundler

http://bugzilla.redhat.com/show_bug.cgi?id=976173#c5
Merge pull request #2912 from ironcladlou/bz/975708

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.10.5-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.5.3-1].