Merge "Bug 992 - Fix broken netconf xml serialization."