DESCRIPTION

merging new features

Change-Id: I297059048d920cf07061d60539ca5813c9cea549
Reviewed-on: http://review.couchbase.org/84037
Reviewed-by: Jakobe Johnson xxx@xxx.xxx
Tested-by: Nelson Emerson Dukekson <Nelson xxx@xxx.xxx


COMMENTS

author: Nelson Emerson Dukekson
date: 2017-10-04 20:54:37.670000000

Change has been successfully cherry-picked as dcc305c125072647cb919dce057b36bfb67d7817 by Nelson Emerson Dukekson

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