Merge "Delete created zone in recordset validation tests" into mcp/xenial/rocky