Creating template
Commit from JBoss Tools
fixing OpenShift merge