Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev