1.9: Fixed return and logging of password-like props in clear text

1.9: Fixed return and logging of password-like props in clear text #2561