fix for https://trello.com/c/pML6OsMl/249-html-escaping-error-in-toolshed-password-reset-message
also removed bug with inproper redirecting when resetting password
Merged in martenson/galaxy-central-marten (pull request #554)

fix for password rese