Bug 1042300 - make in-content prefs nightly-only, r=MattN, a=lsblakk over IRC
Bug 1042300 - test fix: shouldn't assume in-content and instantApply prefs are enabled, r=jaws, a=lsblakk over IRC