Merge "Add test for default DNS zone per tenant"