Few merge problems and fixes
Merge branch 'discussion-email-verification' of https://github.com/guardian/frontend into discussion-email-verification