Fixing OpenShift Merge
Hopefully fixed Openshift
Fix 2 Openshift