Merge "BUG-832 Fix exception from sal-netconf-connector."