[WFLY-2203] Work around WFLY-2283; add a test
Merge pull request #5889 from bstansberry/ds.xml-override

[WFLY-2203] Work around WFLY-2283; add a test