Merge "BUG-2511 Fix XXE vulnerability in Netconf"