Creating template
Commit from JBoss Tools
fixing Openshift merge
fixing Openshift merge