CBLT-82:  tokens need @@TWO@@ at signs

Change-Id: I6feee7c378d611870fa7b4100e5076bad06f0812