CBD-957:  2.1.1 branch at same point as 2.1.0

Change-Id: I2063de310805acc404b3862ef3d1ad2a4452fd27
Reviewed-on: http://review.couchbase.org/26799
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>
Merge remote-tracking branch 'origin/2.1.0' into 2.1.1

* origin/2.1.0:
  MB-8357 Don't merge view log files

Change-Id: I3a24e1d8d74166dae203ad2e3b3815e03841d5bc
MB-8420: Change invalid view name error to "not found"

If you query with a view name that doesn't exist in a design
document and error with HTTP status code 500 was returned.
This commit changes it to a not_found error with HTTP status
code 404.

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

* origin/2.1.1:
  MB-8420: Change invalid view name error to "not found"
  CBD-957:  2.1.1 branch at same point as 2.1.0

Change-Id: Id84091d420c3c8067057e5d4b027e14e0a777565