RESTEASY-869
Merge branch 'Branch_2_3_xxe' into Branch_2_3