Accept a command line options override.
Merge branch 'cli-opts'
changelog: options map