Do not allow underscores in option names. Closes #2391
Merge pull request #2397 from alco/option-parser-fix

Do not allow underscores in option names. Closes #2391