clean-up sort functions
Merge branch 'CSC-Trigger-Upgrade-GEM-RPC-forSLHC12' of github.com:gem-sw/cmssw into CSC-Trigger-Upgrade-GEM-RPC-forSLHC12