Fix internal authentication resend email error: https://bugzilla.redhat.com/show_bug.cgi?id=915130
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master