DESCRIPTION

Backport some fixes to tests that were fixed in master.

Change-Id: Ia666fcacaec54c1ad8f409d458ac4603bcca84dc
Reviewed-on: http://review.couchbase.org/81795
Reviewed-by: Nelson Emerson Dukekson <Nelson xxx@xxx.xxx
Reviewed-by: Monique Barker <Monique xxx@xxx.xxx
Tested-by: Monique Barker <Monique xxx@xxx.xxx


COMMENTS

author: Jakobe Johnson
date: 2017-08-02 23:42:53.670000000

Change has been successfully cherry-picked as b8334a1e77a59d3e7f4f949579ea35ed7ab68c45 by Jakobe Johnson

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