Merged CSC-Trigger-Upgrade-GEM-RPC-SLHC9 from repository gem-sw
clean-up