final openshift support changes