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
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
Merge pull request #4461 from ironcladlou/bz/1052059

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