DESCRIPTION

More backports to fix sanity in 4.6.3

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


COMMENTS

author: Monique Barker
date: 2017-08-03 00:39:50.866000000

Change has been successfully cherry-picked as 2603623a7ab16cb2fcb0927e6ac427f9ee6f3e83 by Monique Barker

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