This bug will track upstream pull requests needed in OSE 2.1.z: https://github.com/openshift/origin-server/pull/5431
*** This bug has been marked as a duplicate of bug 1110062 ***