Merge "Drop EOL branches from job definitions"