MB-12048: All changes for this bug are merged

Change-Id: I5ae7f09bda3a22274839e1d73b7dd6f502bf053f
Reviewed-on: http://review.couchbase.org/40974
Tested-by: Volker Mische <volker.mische@gmail.com>
Reviewed-by: Sriram Melkote <siri@couchbase.com>