Update & merge back the changes from OpenShift 3 util pkg