UPSTREAM: 47850: fix for bz1507257 hacked from upstream PR47850#17097

Merged

openshift-merge-robot merged 1 commit intoopenshift:masterfrom

rajatchopra:dockershim

Nov 1, 2017

Commits on Oct 30, 2017

UPSTREAM: drop: fix for bz1507257 hacked from upstream PR47850, drop these changes in favour of that PR because this one does not carry the entire dependent chain. Conflicts were removed manually.

dcbw
authored and
Rajat Chopra
committed