Adjustments for JBoss EAP 6.1 (JBoss AS 7.2)