Fix 9.2 conflicts for "Geo - Properly set tracking database connection and cron jobs on secondary node"
- Encountered conflicts while picking !1987 (merged) onto
9-2-stable-ee
- Please fix the conflicts and merge this into
9-2-stable-ee
/cc @rspeicher