fixes #6060 - Adds content override to CLI, BZ 1104638
Fixes #8242 - Create docker-tag command
Merge pull request #247 from cfouant/content-override

fixes #6060 - Adds content override to CLI, BZ 1104638
Merge pull request #250 from daviddavis/temp/20141103142929

Fixes #8242 - Create docker-tag command