upgrate -> upgrade, cleanups of GCT converter
Merge branch 'l1t-devel' of github.com:cms-l1t-offline/cmssw into hidev