[4.x] Improve resource syncing (refactor + handle mapping cleanup)#1411

lukinovec wants to merge 4 commits intomasterarchtechx/tenancy:masterfrom

resource-syncing-refactorarchtechx/tenancy:resource-syncing-refactorCopy head branch name to clipboard