consolidate openshift and master