Merged l1t-o2o-updates-720 from repository cms-l1t-offline
merge L1 o2o updates with latest cond of Giacomo