Creating template
merging

Merge remote-tracking branch 'openshift/master'
openshift support