Merge "Don't test EOL cinderlib branches"