Stuart already submitted a pull request against the 7.1 branch for this issue. I'm creating this tracking jira since Andy mentioned that it is important to fix for EAP 6.0.1.