Automated cherry-pick of #820 on release-3.7#830

openshift-merge-robot merged 1 commit intoopenshift:release-3.7openshift/origin-aggregated-logging:release-3.7from

openshift-cherrypick-robot:cherry-pick-820-to-release-3.7openshift-cherrypick-robot/origin-aggregated-logging:cherry-pick-820-to-release-3.7Copy head branch name to clipboard