merge Run2HSCP_v2 with CMSSW_7_2_X_2014-08-31-0200