Back port of WFLY-3886 into JBoss EAP 6.4.1
*** This bug has been marked as a duplicate of bug 1202440 ***