eb-7569: converted to use DOM api to safely build xml for key-value pairs
Merge remote-tracking branch 'upstream/master'