Merge branch 'releases/1.8.0'
Merge branch 'releases/1.8.1'
Revert "Fix bug in password reset validation error display"

This reverts commit c515f75d2b7cb30ef6b3b66fcf9f47cb106b31de.
Fix bug in password reset validation error display

[Fixes #75997344] https://www.pivotaltracker.com/story/show/75997344

- Previously, in case the user entered a password that did not match the confirmation, the page would break and they would see  a 'something went amiss' message.

Signed-off-by: Rob Gallagher <rgallagher@pivotallabs.com>
Merge branch 'hotfix/1.8.1.1' into develop