Merge "Updated sal-netconf-connector mountpoint integration"