A few fixes related to implementing SCRAM-SHA-*
Authored by: mfg8876 2011-11-28
Parent: [r281]
Child: [r283]