CMSSW_7_1_21_patch2

cms-bot is going to build this release