Creating template
d
Merge remote-tracking branch 'openshift/master'
deployment fixes