Merge "Fix extra_context for test upgrades job"