MB-9169:  neither master nor 3.0.0 have needed changes from 2.2 branch

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