Change admin password reset to 3-way option, no cleartext email passwords, s#16 redux
Merge branch 'hotfix/2.1a35' of github.com:vanillaforums/Garden into hotfix/2.1a35