Fixed failing EmailControllerTest
Merge branch 'master' into id-pref-fix
Merge pull request #4796 from guardian/id-pref-fix

Attempting to fix the Email preferences refresh issue