Merge pull request #1660 from jbertram/master

clean up a few HA-related things
format the XSD consistently