MB-9551: These changes need to cover this bug

Change-Id: I682138d1999abbf26facf00f69179bd055e9329f
Reviewed-on: http://review.couchbase.org/30338
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>
Tested-by: Andrei Baranouski <andrei.baranouski@gmail.com>