adjust password reset links expiration to 1 week and include expiration info in sent mails, fixes #1647 Closes #1647 Merge request !1061