Fix merge conflict
Fix merge conflict

xasx/wildfly,tadamski/wildfly,rhusar/wildfly,jstourac/wildfly,rhusar/wildfly,xasx/wildfly,wildfly/wildfly,99sono/wildfly,iweiss/wildfly,iweiss/wildfly,jstourac/wildfly,xasx/wildfly,tomazzupan/wildfly,iweiss/wildfly,pferraro/wildfly,wildfly/wildfly,pferraro/wildfly,tadamski/wildfly,golovnin/wildfly,iweiss/wildfly,wildfly/wildfly,pferraro/wildfly,jstourac/wildfly,tomazzupan/wildfly,99sono/wildfly,pferraro/wildfly,rhusar/wildfly,rhusar/wildfly,tadamski/wildfly,golovnin/wildfly,99sono/wildfly,wildfly/wildfly,golovnin/wildfly,jstourac/wildfly,tomazzupan/wildfly