Disabling ContinueOnUnexpectedMaster.
Merge branch 'master' into replication
Fixing this test.
Fixing this test too.
Changing bson behaviour to skip unknown fields.

That way it matches json encoding.
Merge branch 'master' of github.com:youtube/vitess