openshift port
Merge branch 'master' into salesforce
fixup port for openshift