Don't upgrade plaintext passwords if safePasswords is true.

That's what we claimed the behavior was. Only upgrade if safePasswords
is 2.