Keep parity with 2.1 openshift.sh