fixing OpenShift merge
fixing OpenShift merge3
Back to normal - drop OpenShift