Scott Marlow, I've filed PR https://github.com/wildfly/wildfly/pull/8706 based on top of yours which also fixes that issue in the test suite.