Merge "Fix telemetry-tempest-plugin scenario tests" into mcp/xenial/rocky