bug 1001466removed deprecated content first patch
Revert "Merge pull request #1674 from erikvold/1077372"

This reverts commit f1091a4fc7c9e1f3918c367eda66b3f190e3e626, reversing
changes made to 56538e2ca6ec7d92bd304fed17fe9b860e05359a.
Merge pull request #1676 from y-t-/1001466-remove-deprecated-on

bug 1001466 - removed deprecated onMessage, r=@zombie
bug 983322 - sanitize preferences-branch
Merge pull request #1664 from zombie/983322-sane-prefsBranch

bug 983322 - sanitize preferencesBranch, r=@erikvold, @ZER0
bug 1015621 - return blank thumbnail in e10s
Merge pull request #1496 from zombie/1015621-thumb-crash

bug 1015621 - getThumbnail crashes child process, r=@jsantell