fixes #6060 - Adds content override to CLI, BZ 1104638
Merge pull request #247 from cfouant/content-override

fixes #6060 - Adds content override to CLI, BZ 1104638