updates from Tao
Merge pull request #122 from dildick/CSC-Trigger-Upgrade-GEM-RPC-SLHC10

updates from Tao