Merge "Key the conference participants using the Endpoint" into nyc-mr1-dev