dns_zone_master and dns_zone_slave are renamed as dns_zone_primary and dns_zone_secondary. (cherry picked from commit 916760ae)