Merge "Fix race condition in SSH NETCONF server"