MB-7250:  merge changes from plabee/MB-7250

Change-Id: I870b692e36e8fc1a9bf4c4bfabcd2a947455129c
Reviewed-on: http://review.couchbase.org/41750
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>