Merged l1t-devel-CMSSW_7_1_0_pre2 from repository cms-l1t-offline
fix up test job and tower producer