Merge "Fix test_verify_created_server_ephemeral_disk"