JAVA-2580: Remove any remaining incidental references to MongoDB 2.4

Author: jyemin

driver-async/src/test/functional/com/mongodb/async/client/CrudTest.java

@@ -232,10 +232,7 @@ private BsonDocument toResult(final MongoOperationUpdateResult operation) {
         if (updateResult.isModifiedCountAvailable()) {
             resultDoc.append("modifiedCount", new BsonInt32((int) updateResult.getModifiedCount()));
         }
-        // If the upsertedId is an ObjectId that means it came from the server and can't be verified.
-        // This check is to handle the "ReplaceOne with upsert when no documents match without an id specified" test
-        // in replaceOne-pre_2.6
-        if (updateResult.getUpsertedId() != null && !updateResult.getUpsertedId().isObjectId()) {
+        if (updateResult.getUpsertedId() != null) {
             resultDoc.append("upsertedId", updateResult.getUpsertedId());
         }
         resultDoc.append("upsertedCount", updateResult.getUpsertedId() == null ? new BsonInt32(0) : new BsonInt32(1));

driver-core/src/main/com/mongodb/connection/ServerVersion.java

@@ -26,7 +26,7 @@
 import static java.util.Arrays.asList;
 
 /**
- * Holds an array of three integers representing the server version, e.g. [2, 4, 1].
+ * Holds an array of three integers representing the server version, e.g. [3, 4, 1].
  *
  * @since 3.0
  */

driver-core/src/test/functional/com/mongodb/connection/ServerMonitorSpecification.groovy

@@ -200,7 +200,7 @@ class ServerMonitorSpecification extends OperationFunctionalSpecification {
                 .hosts(new HashSet<String>(asList('localhost:27017', 'localhost:27018')))
                 .passives(new HashSet<String>(asList('localhost:27019')))
                 .arbiters(new HashSet<String>(asList('localhost:27020')))
-                .version(new ServerVersion(asList(2, 4, 1)))
+                .version(new ServerVersion(asList(3, 4, 1)))
                 .electionId(new ObjectId('abcdabcdabcdabcdabcdabcd'))
                 .setVersion(2)
     }