Merge branch '3.0.x-group' into 3.0.x
Conflicts resolved: 	driver-compat/src/main/com/mongodb/DBCollection.java