Merge "Workaround pip10 uninstall of packages"