[CLC-1369] Consolidate endpoint key-names, check for mandatory fields on merged endpoints

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1369

- Does not finish the ticket, merely wraps up most of the backend work