Revert "Beamspot nominal collision2015: set new default"

Reverts cms-sw/cmssw#5464