Patch OpenShift psutil bug
Merge branch 'openshift-patch' into dev