Bug 886423 - Turn on the click-to-play UI by default in Firefox desktop. As a side effect, remove the plugin permission from about:permissions because we're using per-plugin permission not per-site and about:permissions doesn't know about that. (page info knows about it) r=keeler
Bug 886403 - Spelling errors from bug 880735, r=spelling