Backport of "aggregator: Always lock aggpad around update_time_level" into 1.22
Backport of !611 (merged) "aggregator: Always lock aggpad around update_time_level".
Commits:
Backport of !611 (merged) "aggregator: Always lock aggpad around update_time_level".
Commits: