Mongo master

2 fixes for errors if libbson is included into C++ project