Merge "BUG-832 Refactor netconf connector"