Corscontroller openshift

Rebase of origin/corscontroller-openshift against origin/master