Merge "Update netconf user guide"