Revert "Nominalcollision2015 default"
Merge pull request #6830 from cms-sw/revert-6751-NominalCollision2015-default-CMSSW_7_4_X

Revert "Nominalcollision2015 default"