*8599* enable one-step password reset during upgrade
Merge remote-tracking branch 'upstream/ojs-stable-2_4' into ojs-stable-2_4