Merge "Test server create with ephemeral disk"