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 PR: jbossas/jboss-as#4276