bug 1005488 - deprecate content/content
Merge pull request #1500 from zombie/1005488-deprecate-content

bug 1005488 - deprecate content/content, r=@jsantell