commit for safety
mods of ancillary = (out of date) files for consumes migration
Merged MixingModule_consumes_migration_fixes from repository mdhildreth
fix compile errors - last changes not committed properly last time?
Merged refs/pull/2826/head from repository cms-sw
Merge pull request #2826 from mdhildreth/MixingModule_consumes_migration_fixes

Consumes -- Mixing module consumes migration fixes
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X