Merge pull request #1659 from jbertram/master

HA related changes
clean up a few HA-related things