Merged CMSSW_7_1_X from repository cms-sw
Some SIM-related consumes fixes for Muons
Merge pull request #3629 from mdhildreth/Muon_SIM_Consumes_fixes_4_30

Consumes -- Muon sim consumes fixes for 71X