Back port of WFLY-3886 into JBoss EAP 6.4.1
PR sent : https://github.com/jbossas/jboss-eap/pull/2359
*** Bug 1202441 has been marked as a duplicate of this bug. ***
Retroactively bulk-closing issues from released EAP 6.4 cummulative patches.