bug 1005488 - deprecate content/content

our tests never clean prefs after themselves
Merge pull request #1503 from zombie/1005488-deprecate-content

bug 1005488 - deprecate content/content, set test pref, r=@jsantell