issue #21536: get config workspaces working
issue #21532: added ItemItemSiteRelation model
Merge pull request #868 from shackbarth/21536

issue #21536: get config workspaces working
Merge pull request #870 from shackbarth/21532

issue #21532: added ItemItemSiteRelation model
Fix 1-4-4 merge into master
Merge pull request #872 from lynnaloo/master_merge

Merger 1_4_4 into master