This is follow-up of 64543a028f .
These options are defined as ListOpt, so array values should be
rendered as a comma-seprated strings.
Change-Id: Id763f60274d965cf697873b1649b7de27094d842
(cherry picked from commit ba711f966c)
(cherry picked from commit e0d2b0ca65)
(cherry picked from commit 713b14f836)