Use more friendly value for primary and secondary zones. It used master for ages, but that might have wrong connotation to someone. Use something without problematic history.
Imports commit 7e1db866748aef3c07657e0761b19aec6de9bf6f