Creating template
Merge remote-tracking branch 'openshift/master'
Merge remote-tracking branch 'origin/master'