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
quick fix for 972958 - increase lock timeout
Now redirecting to My Applications when app creation times out
More assertions on app creation timeout tests
Bug 975700 - check the httpd pid file for corruption and attempt to fix it.
Merge pull request #2908 from rajatchopra/master

Merged by openshift-bot
Merge pull request #2909 from rmillner/BZ975700

Merged by openshift-bot
Bug 976173 - oo-* scripts fail on node with ruby LoadError
The console tabs are slightly misaligned
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