Bug 1046430: Make cookie behavior the same on beta/release as on aurora/nightly (r=jdm)