Merge "Bug 8824 - NETCONF request hangs when rpc-rply has invalid xml" into stable...