DESCRIPTION

Resolving merge conflicts

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


COMMENTS

author: Tate Garrett
date: 2015-09-28 18:01:09.936000000

Change has been successfully cherry-picked as 5486024cdf886be4cd23bfafc45fa6650c0c7578

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