WFLY-382 Fix & re-enable ignored XCAML tests
Merge pull request #6163 from stuartwdouglas/WFLY-382

WFLY-382 Fix & re-enable ignored XCAML tests