Merge "Modify SetupClass to pick up AZ of the created volume type" into mcp/caracal