Merge pull request #4416 from bparees/jboss_startup

Merged by openshift-bot
Merge pull request #4435 from bparees/ci_timeouts

Merged by openshift-bot
Merge pull request #4444 from ironcladlou/dev/python-scl

Merged by openshift-bot
Merge pull request #4453 from pravisankar/dev/ravi/repair-bugfix

Merged by openshift-bot
Proxy gear ttl from env var
Merge pull request #4452 from bparees/zend_path_error

Merged by openshift-bot
Merge pull request #4348 from bparees/build_disabled

Merged by openshift-bot
Bug 1051446
Merge pull request #4457 from danmcp/master

Merged by openshift-bot
Bug 1051984 - Add -w to quota command
Merge pull request #4458 from jwhonce/bug/1051984

Merged by openshift-bot
Removed double-slash from my.conf.erb
Bug 1051651 - Added more verbose error reporting when MySQL fail to start
Bug 1045342 - Fix the $MYSQL_VERSION env var is missing for mysql-5.1
Bug 1051910: Fix Python 2.6 regressions

The Python 3.3 SCL work broke many aspects of the 2.6 version by erroneously moving files/directories
shared by 2.6/2.7 into the 2.7 version directory.
Bug 1052059: Fix Python 3.3 venv path references
Merge pull request #4460 from ironcladlou/bz/1051910

Merged by openshift-bot
remove unnecessary cart-data variable descriptions
Merge pull request #4461 from ironcladlou/bz/1052059

Merged by openshift-bot
Bisect the scale up/down threshold more evenly for lower scale numbers