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

Merge from wildfly/8.x for WFLY-3703