Merge "Skip adding host to aggregate with az if host already in other zone" into mcp/ussuri