DESCRIPTION

CBQE-4289: Fix merge testcases

Change-Id: Ia1a077b94cef3fbb2222a55f46493a713db5d0c5
Reviewed-on: http://review.couchbase.org/82898
Reviewed-by: Adelaide Rodgers xxx@xxx.xxx
Tested-by: Adelaide Rodgers xxx@xxx.xxx


COMMENTS

author: Adelaide Rodgers
date: 2017-08-30 06:16:53.752000000

Change has been successfully cherry-picked as 327640d47746f4b1f56106827b8922578eb417ff by Adelaide Rodgers

-------------------------------------
