Move deprecation setting into tests themselves
Merge pull request #1128 from jsantell/893591-display-deprecation-only-when-set

Fix Bug 893591 only display deprecation message when preference set, r=@erikvold