Merge "Consider pre-existing VMs when testing server list"