Bug 1041808 - Thousands of about:blank windows when cookies policy set to "Keep until: I close Firefox". r=smaug.

--HG--
extra : rebase_source : 8706fb4ca98b9d01893dd4544d395161a4277474
Bug 1036186 - Reset Migration wizard no longer skips the first step to choose a browser. r=smaug.

--HG--
extra : rebase_source : 599d78a04a085304154e8231d5bd2239d025ab22