wildfly/wildfly — pull request #7015 by bstansberry (2014-12-03 18:41:51+00:00)
Title: WFLY-3519

Replaces #6403 with an additional commit that fixes the test failure.