NCBC-283-Fix failing tests for 2.1.1-763

Change-Id: I796a4879c8388fab2dd6a8d5c1d255056c911744
Reviewed-on: http://review.couchbase.org/27707
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Saakshi Manocha <saakshi.manocha@globallogic.com>
Tested-by: Saakshi Manocha <saakshi.manocha@globallogic.com>