Changes for WildFly8.