MB-8102:  use branch to pull in just the changes needed for segfault hot-fix

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