Additional changes for RH OpenShift
Latest RHOS updates.