Sync with upstream changes.
Add new tunnel manager that connects to NMR machines directly
and bypasses 'dreev'.