fix upgrade command and omnibus check path
update tests for changed upgrade command
fixing tests for upgrade command with and without versions
Merge pull request #201 from mortardata/choey-clean_upgrade_command

fix upgrade command and omnibus check path