GIT-1861: Fixed reset password and activation dead lock for users with accepted_terms = false and other minor bugs. (#3082) This fixes #1861, fixes #3080, fixes #3079 and closes #3081.
