Merge from wildfly/8.x for WFLY-3703