Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev