CXX-126 Backport rc1..rc2 changes

CXX-126 Backport relevant server repo changes applied between rc1 and rc2

Author: hanumantmk

src/mongo/base/error_codes.err

@@ -82,6 +82,7 @@ error_code("UnknownReplWriteConcern", 79)
 error_code("RoleDataInconsistent", 80)
 error_code("NoClientContext", 81)
 error_code("NoProgressMade", 82)
+error_code("RemoteResultsUnavailable", 83)
 
 # Non-sequential error codes (for compatibility only)
 error_code("NotMaster", 10107) #this comes from assert_util.h

src/mongo/util/assert_util.h

@@ -36,7 +36,8 @@ namespace mongo {
         PrepareConfigsFailedCode = 13104, // uassert( 13104 )
         NotMasterOrSecondaryCode = 13436, // uassert( 13436 )
         NotMasterNoSlaveOkCode = 13435,   // uassert( 13435 )
-        NotMaster = 10107                 // uassert( 10107 )
+        NotMaster = 10107,                // uassert( 10107 )
+        IndexOptionsDiffer = 17427        // uassert( 17427 )
     };
 
     class MONGO_CLIENT_API AssertionCount {

src/mongo/util/version.cpp

@@ -31,7 +31,7 @@ namespace mongo {
      *      1.2.3-rc4-pre-
      * If you really need to do something else you'll need to fix _versionArray()
      */
-    const char versionString[] = "2.6.0-rc1";
+    const char versionString[] = "2.6.0-rc2";
 
     // See unit test for example outputs
     BSONArray toVersionArray(const char* version){