pullrequest #73

Intended for 6.2. I'm submitting the PR now just to track it since I did the equivalent work now on upstream.

Upstream: https://github.com/jbossas/jboss-as/pull/4376
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=915594

Upstream: https://github.com/jbossas/jboss-as/pull/4376
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=915594