PM-757: Improve XML quoting for netlogger messages
Merge branch '4.3'