Merged requested to merge emoyse/athena:22.0_yet_more_CA_sync_fixes_18 into 22.0
(copied from !58235 (closed))
This should not be merged before !58199 (merged) (I reverted my own fix for that of @tstreble 's, which is better anyway )
It's another round of CA sync changes. As usual, it will not run in production.
In my local q449 test, this removes the
Py:diff-root INFO comparing  leaves over entries... Py:diff-root INFO Found  identical leaves Py:diff-root INFO Found  different leaves Py:diff-root INFO all good.
(To be clear, this is after !58199 (merged) is merged - hopefully I won't pick up a conflict since I cherry-picked, but the subsequent rebase means I may).