reenable merging to origin:master#1021

Merged

openshift-merge-robot merged 1 commit intoopenshift:masterfrom

deads2k:reenable-master

Jun 28, 2018

Commits on Jun 28, 2018

reenable merging to origin:master
deads2k
committed