Merge "Bug 460 - Fix warning throughout netconf subsystem"