Fix one of many failing mongodb tests.

This just handles some renames and default changes in our
customized version.

Change-Id: I3eea6c28bb3acd5a7c34fff854fb4183f85523fc
Merge "Fix one of many failing mongodb tests." into production