CSHARP-987: fixed issue with bulk upsert identifiers on pre-2.6 servers.
CSHARP-987: Code review changes.