Revert "openshiftdefault"

This reverts commit 4eebf6ade4f9f4f0c1c1b32dbbaaf51033c854de.
Revert "Revert "openshiftdefault""

This reverts commit 3e34e1b5059adfc7ae01fd47980dabfeab4c7212.