9ecd5aa
Handle the upgrade case where the users manually specify an smb passwd file location or one of the directory locations we want to move.