Merge "Clean definitions of the CI jobs for EOL'ed branches"