MB-6895 Fix badmatch on error

For old couchdb views, used for development subset, expect
error results to be inlined with non-error results.

Change-Id: I5cd33ee7caeeec4bd65b548431788b2f3967fb35
Reviewed-on: http://review.couchbase.org/24474
Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
Merge remote-tracking branch 'origin/2.0.1'

Change-Id: I1fc51351f29cf34c126db86fa013ad7d38958f9f