[UP-4139] Remove the reset password portlet and move that functionality ...

...into the login portlet.

[UP-4139] Rollback some whitespace only changes caused by IDE settings.
I think I can get rid of it here.  Will give it a shot and update the PR.