Adding Vadim's changes to L1Trigger/GlobalMuonTrigger and L1Trigger/CSCTriggerPrimitives