PileUpSubtractor is modified to take consumesCollector, hiPFJetAnalyzer is updated for track matching, and several other functions changed because of the changes in input they take