Wildfly setup fixes
Merged setup