Merge from wildfly/8.x
Merge pull request #1 from ServiceMesh/WFLY-3703

Merge from wildfly/8.x, WFLY-3703