XCOMMONS-457: Improve generic XML syntax
(cherry picked from commit 0f35c4dac5ee8a1b4b703c321128a23302949877)