Merge from wildfly/8.x, WFLY-3703