There are 3 recently added config options that have underscores instead
of dashes:
* custom_user_opts (added in I96b6e578eb59813e5e0c8a2fe7a14c5ecc369be7)
* scenario_availability_zone and scenario_compute_nodes
(both added in I5459150a0eac9bed6a6a62a126bd9ec0648941fe)
The rest of options are declared with words separated by dashes. This patch
makes name style consistent across the project. The change affects CLI only.
Change-Id: I9d799827a36682fbe7ae73b22bcbaaf2f05afd6e