openshift.ks fixes

Miscellaneous clean-ups.