Revert "Beamspot nominal collision2015: set new default"
Merge pull request #5510 from cms-sw/revert-5464-beamspot_NominalCollision2015-CMSSW_7_3_X_2014-09-22-0200

Revert "Beamspot nominal collision2015: set new default"