Fix WFLY-2901.
Merge pull request #5900 from jfclere/master

Fix WFLY-2901.