PHP-1106: Allow array or object arg to MongoWriteBatch::add()
Merge pull request #703
Fixed PHP-1099: socketTimeoutMS=-1 doesn't work in the connection uri
Fix log tests
Merge pull request #702 from bjori/PHP-1099-sockettimeout-ctor

PHP-1099: socketTimeoutMS=-1 doesn't work in the connection uri

* bjori/PHP-1099-sockettimeout-ctor:
  Fix log tests
  Fixed PHP-1099: socketTimeoutMS=-1 doesn't work in the connection uri
Merge remote-tracking branch 'upstream/v1.5'

* upstream/v1.5:
  Fix log tests
  Fixed PHP-1099: socketTimeoutMS=-1 doesn't work in the connection uri
  PHP-1106: Allow array or object arg to MongoWriteBatch::add()
Fixed PHP-1109: upsert returns an array of ids rather then the _id
Merge pull request #704 from bjori/PHP-1109-upserted-id

Fixed PHP-1109: Upsert should return _id instead of array of ids

* bjori/PHP-1109-upserted-id:
  Fixed PHP-1109: upsert returns an array of ids rather then the _id
Merge remote-tracking branch 'upstream/v1.5'

* upstream/v1.5:
  Fixed PHP-1109: upsert returns an array of ids rather then the _id