Merge pull request #324 from alphagov/186260603-support_new_aws_vm_ty… · alphagov/paas-docker-cloudfoundry-tools@10f7bb5