Merge "BUG-1521 netconf-client line coverage"