Merged CSC-Trigger-Upgrade-GEM-RPC-SLHC10 from repository dildick
update customs