allow embedded hyphens in OptionHelper#getValidCliArgs CLI parsing
am: a8b95eb801

Change-Id: I3dfea35b557696c5114aa7c1eeb30d015b589285