Merge "Add the GlanceRegistry and Horizon endpoints to EndpointMap"