CBLT-143:  fix up echo statements

Change-Id: Ifeb6bf5a7dacdc3fc6dba917b9cdcfb2129f111d