DESCRIPTION

Incrementally fixing changes that were somehow reverted.

Change-Id: I16e512ae591ecd0b41fbf7d73bf17c568fb5f5ac
Reviewed-on: http://review.couchbase.org/77353
Reviewed-by: Jakobe Johnson xxx@xxx.xxx
Tested-by: Jakobe Johnson xxx@xxx.xxx


COMMENTS

author: Jakobe Johnson
date: 2017-04-26 00:34:35.269000000

Change has been successfully cherry-picked as 98756ee2a8dd8acd8c9b0699bb94454ebb2705d6 by Jakobe Johnson

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