DESCRIPTION

CBQE-4065/MB-22644:
The exact same changes that were made in watson. Added a new test into
test_use_suffixes_and_tokens

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


COMMENTS

author: Jakobe Johnson
date: 2017-04-11 22:53:54.026000000

Change has been successfully cherry-picked as 87320880d6dbc470ef234041f8af37bb64c190ea by Jakobe Johnson

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