Flatten batchspec_t optargs.

Per #2185.  ReQL tests are not patched yet, but it passes its unit tests.
Fix ReQL tests to reflect new style for batch operations.
Merge branch 'gchpaco_2185' into next

Fixes #2185 for next.  In CR 2083.