Extended2015 is the default scenario from now on.
Update to Extended2015 as default.
Cleanup out of date files.
Clean up out of date files.
Merge pull request #3249 from ianna/payload-scripts-update-cleanup

CondTools/Geometry -- Scripts update and cleanup
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X