Fixing two more crashes in cbson.
Merge branch 'master' into replication
Fixing return value and test.
Cleaning up test.