Change the default collection to non-upgrade, since Phase1 and Phase2 have this changed in the customisation
Merge pull request #5968 from mark-grimes/fix2017ForSLHC20

Fix 100xx (2017) workflows