Merge cms-sw CMSSW_7_4_X into my trackergeo_readyforupgrade-74x