NO-JIRA: Sync 0.4 with 0.5#463

openshift-merge-bot[bot] merged 7 commits intoopenshift:release-coo-0.4openshift/monitoring-plugin:release-coo-0.4from

jgbernalp:sync-0.4-with-0.5jgbernalp/monitoring-plugin:sync-0.4-with-0.5Copy head branch name to clipboard