Merge from wildfly/8.x