CMSSW 716 template for 71X
trigger histo merging at the endLumi
Merge pull request #4928 from deguio/fixFastTimerService_71x

trigger histo merging at the endLumi
Merge pull request #4917 from Martin-Grunewald/716TemplateFor71X

CMSSW 716 template for 71X
Merge remote-tracking branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X