updates for RHSCL 1.1
Merge pull request #5409 from maxamillion/admiller/rhscl_1.1-RC2

Merged by openshift-bot