PHP-820: Use php_mongo_mongoid_to_hex for bson_to_zval().
Merged pull request #535
Fix couple of skipifs when only running a ReplicaSet
Merge Pull Request #536

* bjori-fix-skipifs:
  Fix couple of skipifs when only running a ReplicaSet