Merge "Add checks to skip test in case of production=True and ensure host selection without instances before adding host to aggregate" into mcp/caracal