Merge cms-sw CMSSW_7_0_X into my CMSSW_7_0_X