Merge "Remove deprecated extra_repo* parameters from jobs template"