Merged l1t-devel from repository cms-l1t-offline