Merged openshift project with updates.