Remove the "default policies" from all configs, have tests compose configs to get the policies they want.
Tweak existing tests to work again
Add a test for ha-promote-on-shutdown, and associated refactoring.
Merge in default
Merge in default
Whitespace
Merge bug26150