Better JBoss / Wildfy deployment descriptor
Merge branch '1_2_X'