Merge pull request #4394 from danmcp/master

Merged by openshift-bot
<oo-diagnostics> OSE version-agnostic - bug 1043340
Merge pull request #4397 from sosiouxme/bz1043340

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.19.5-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.18.4-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.19.2-1].