Merge openshift changes from master