Merge "services/mounttable/lib/servers.go: Avoid clobbering the port in the ListenSpec when neighborhood is in use."