CBD-935:  remove unnecessary quotes

Change-Id: I3fd34bbf8e8bec32e194b8ae8c2ddb751dfcdd07