[WFLY-3240] Implement workaround for WFLY-3044 without requiring a spec maintenance release
Merge pull request #6153 from rhusar/WFLY-3240

[8.0.1] [WFLY-3240] Implement workaround for WFLY-3044 without requiring a spec ...