Bug 944242 - Properly handle do-not-track options when upgrading from 1.1