add input parameter for defining the beam spot InputTag
add explicitlely the new (untracked) beamSpot parameter
Change starting capacitor ID to match MC
Merge pull request #1784 from mdhildreth/7X_DataMixerFix_for_PreMixing

Sim fixes -- Change starting capacitor ID to match MC
Make static plugin maker instances const

The maker classes used by the plugin system only have const interfaces so it is safe to make all the static instance of these classes const. This shows the intent better and allows the static analyzer to better understand what is happening.
Merge pull request #1796 from Dr15Jones/makePluginMakersConst

Multithreading fixes -- Make static plugin maker instances const
Merge pull request #1775 from mtosi/from-CMSSW_7_0_0_pre10_fixBeamSpotInParametersDefinerForTP

Sim fixes -- fix beam spot in ParametersDefinerFoTP
Merge remote-tracking branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X