Merge "BUG-1393 Fix ignoring module based capabilities in sal-netconf-connector"