Merged over here into 4.9: https://bugzilla.redhat.com/show_bug.cgi?id=2044438 Marking verified https://github.com/openshift/kubernetes/pull/1138
*** This bug has been marked as a duplicate of bug 2044438 ***