CBLT-82:  tokens need to be surrounded by double at-signs @@

Change-Id: I9588fc4fe0e06d2403d10117d55bf89b9486de2a