DESCRIPTION

CBQE-4073/MB-22550:
same changes that were made in watson

Change-Id: I7e2ecbb4e29a100ce55547b80ee9177ded2b811b
Reviewed-on: http://review.couchbase.org/76734
Reviewed-by: Monique Barker <Monique xxx@xxx.xxx
Tested-by: Monique Barker <Monique xxx@xxx.xxx


COMMENTS

author: Monique Barker
date: 2017-04-12 23:58:49.586000000

Change has been successfully cherry-picked as 842da06c2092e8dde19600150740fbea4afdd988 by Monique Barker

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