DESCRIPTION

cbqe2861: merge changes tpcc and sabre setups

Change-Id: Ie724f06944539b4b814f42b8b322e3c4167363a6
Reviewed-on: http://review.couchbase.org/52264
Reviewed-by: Amani Conrad <Amani xxx@xxx.xxx
Tested-by: Amani Conrad <Amani xxx@xxx.xxx
Tested-by: Hugo Blankenship xxx@xxx.xxx


COMMENTS

author: Tate Garrett
date: 2015-06-22 18:01:25.347000000

Change has been successfully cherry-picked as 0986dcebe4db9c0169b964b499273bc0e58fec24

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