fixes for ambiguous password prompt on upgrade [#67952982]
fixing tests
Merge pull request #193 from mortardata/choey-fix_upgrade_password

fixes for ambiguous password prompt on upgrade [#67952982]