Looks like the upstream work is happening here: https://github.com/openshift/origin-server/pull/5717
This is, if not an exact duplicate, apparently addressed by the same fix as bug 1140378. *** This bug has been marked as a duplicate of bug 1140378 ***