CLOUDSTACK-6984: Resolving issues found during simulator run