Fix unit tests after previous change to serializer data structures. CR 1221 by Etienne.
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next