Creating template
clean up for merge
Merge remote-tracking branch 'openshift/master'
changes