Updates for WildFly branch