Creating template
Merge remote-tracking branch 'openshift/master'
Changes after merging with OpenShift repo