Forward port essential changes from the suse-cloud-2.0 branch