AS7.1-6031

Port of https://github.com/jbossas/jboss-as/pull/3816 to 7.1 branch