Tuning scale up and down
Merge pull request #2685 from danmcp/master

Merged by openshift-bot