Merge "BUG-692 Fix major issues reported by sonar for netconf subsystem"