Merge "Avoid DB_MASTER use on password checks and defer password upgrades"