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

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