2.2 security hardening

2.2 equivalent for https://github.com/openshift/openshift-extras/pull/463