CBLT-44:  fix optargs

Change-Id: Ided784ca4dffd359bd64ad632d9d8adbb1bb0d6b