[JIRA-2046][JIRA-2181] fix usage help

Fixes #1354