Bring config in-line with latest WildFly/master