Merged l1t-devel from repository cms-l1t-offline
fixes needed to run Calo trigger Stage 1 demo