Update upr branch

Change-Id: I68ba64257db908a36ad75d1677160c12d094abc5
Reviewed-on: http://review.couchbase.org/29476
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>