Merge "Fix netconf testtool after recent changes to auth in netconf"