Creating template
Openshift Initial
Merge Openshift
fix merge