Catch up with the protobuf changes made in 0.96

All integration tests pass except regression2, which relies on batching,
which is the only thing left to implement.