fixed the setPassword method

was broken because of renamed _logLogin()
Merge branch '3.4' into 3.5
Merge branch '3.5' into 3.6