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

[UP-4139] Rollback some whitespace only changes.
Merge pull request #343 from jhelmer-unicon/up-4139_merge_login_and_reset_password

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