New trees v1 cmssw 7 0 x

 Backport of PR #3240 and #2895 from CMSSW_71X to CMSSW_70X to be used for the CSA14. It does not affect the RECO
@degano @vadler: let me know if there is any issue in the merge step