Add extra district, zone and region options

conf_broker_require_districts should really be true, the only case where an undistricted node could reasonably be used is for running some of the test suites.