documentation formatting fixes
Deprecate all existing HA-related configuration options and move them into <ha-policy>
Merge pull request #1659 from jbertram/master

HA related changes
clean up a few HA-related things
Merge pull request #1660 from jbertram/master

clean up a few HA-related things