GODRIVER-2937 Copy BSONOptions when merging coll or db opts (#1483)

Author: prestonvasquez

mongo/options/collectionoptions.go

@@ -95,6 +95,9 @@ func MergeCollectionOptions(opts ...*CollectionOptions) *CollectionOptions {
 		if opt.Registry != nil {
 			c.Registry = opt.Registry
 		}
+		if opt.BSONOptions != nil {
+			c.BSONOptions = opt.BSONOptions
+		}
 	}
 
 	return c

mongo/options/dboptions.go

@@ -95,6 +95,9 @@ func MergeDatabaseOptions(opts ...*DatabaseOptions) *DatabaseOptions {
 		if opt.Registry != nil {
 			d.Registry = opt.Registry
 		}
+		if opt.BSONOptions != nil {
+			d.BSONOptions = opt.BSONOptions
+		}
 	}
 
 	return d