Upgrade to MongoDB 2.6.0

- All unit test passed but still running Mongo Java Driver 2.11.4
Upgrade to MongoDB 2.6.1

- All unit tests pass
Merge remote-tracking branch 'upstream/master' into tokumx-compatibility