release 2
Merge branch 'getup-openshift-origin-release-1' of https://github.com/getupcloud/origin-server into getup-openshift-origin-release-1
Merge branch 'getup-openshift-origin-release-1' of https://github.com/getupcloud/origin-server into getup-openshift-origin-release-1
Merge branch 'getup-openshift-origin-release-1' of https://github.com/getupcloud/origin-server into getup-openshift-origin-release-1