master
Rebase to master to fix conflicts
Snapshot of CMSSW_6_2_0_pre8.
and test
Add MultipleScatteringParametrisationMaker ESProduct that makes MultipleScatteringParametrisation objects