Change documented options to use dashes instead of underscores
in option names. Continue to support old underscore names for
backward compatibility for a release or two (TBD).
Blueprint: command-options
Change-Id: Ied0d325a9fdd32f80bf8c993887e1975aa6adf16