Fixes for suse-cloud-upgrade