move to CMSSW_6_1_2 and new combine workspace workflow