Merge "BUG-2340 Fix improper cleanup of resources in netconf ssh handler"