fix merge
Merge branch 'mysql55' into getup-openshift-origin-release-3
Merge branch 'getup-openshift-origin-release-3' of github.com:getupcloud/origin-server into getup-openshift-origin-release-3