Temporarily fix upgrade tests#1992

davidcassany wants to merge 6 commits intorancher:mainrancher/elemental-toolkit:mainfrom

davidcassany:improve_integration_testsdavidcassany/elemental-toolkit:improve_integration_testsCopy head branch name to clipboard