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


COMMENTS

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

Patch Set 2: Patch Set 1 was rebased

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

Patch Set 2: Code-Review+2 Verified+1

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