Creating template
Merge remote-tracking branch 'openshift/master' into develop
test openshift