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

stancl merged 5 commits intomasterarchtechx/tenancy:masterfrom

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