Merge "Fix clearing password with DPM.resetPasswordWithToken()" into qt-dev