MB-10962:  include change on hot-fix branch

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