TEZ-1632. NPE at TestPreemption.testPreemptionWithoutSession (Alexander Pivovarov via bikas)
TEZ-1674. Rename configuration parameters related to counters / memory
scaling. (sseth)
(cherry picked from commit 4186c6dee22f8c8bb705973559c9eee9112cc151)
TEZ-1176. Set parallelism should end up sending an update to ATS if numTasks are updated at run-time. (hitesh)

(cherry picked from commit 2600c538886c5864a9248cff04f445cfbde8b203)
TEZ-1658. Additional data generation to Timeline for UI. (hitesh)

(cherry picked from commit 190a74fdc28655f8ca1a3946687aad40c8254ad0)
TEZ-1676. Fix failing test in TestHistoryEventTimelineConversion. (hitesh)

(cherry picked from commit d456a6dd29ebe1d91c0b7223a3bde3739986ede1)