[jboss-as7-dev] Preventing merge commits