Pre-rebase fixes#19200
Merged
openshift-merge-robot merged 5 commits intoopenshift:masterfrom Apr 3, 2018
liggitt:prebase
Merged
Pre-rebase fixes#19200openshift-merge-robot merged 5 commits intoopenshift:masterfrom liggitt:prebase
openshift-merge-robot merged 5 commits intoopenshift:masterfrom
liggitt:prebase