Fixes #5768 Changed term system to content-host
updated all references from system to content host
Merge pull request #4139 from cfouant/cfouant-branch

Fixes #5768 Changed term system to content-host