Merge "Tweak javadoc of setResetPasswordToken" into oc-dev