High Availability and Service Discovery

PR contains changes pertaining to HA and Service Discovery, which leaves us in a good place to deploy to AWS.