This patch alters the logging of options to only display non-default
options when running with --verbose. The behavior of --very-verbose
is not affected.
This commit also fixes all integration tests that were broken with
the change to the logger output.