Merge "BUG-1612 Update netconf testtool to use new ssh server wrapper"