CLOUDSTACK-6984: Resolving simulator issues