Merge "Bug#2977 EndpointManager maps are not threadsafe"