This patch is a follow-up patch for
Ib4ce831a5031459d350fa73601e878e7b319640f.
Improve the description of optional arguments
in the CLI reference and help text.
Change-Id: I6313b8a584385daa7e9fbd558d431faa43015449
(cherry picked from commit 72b4441fe1)