MCO-193 add 'discovery_timeout' to the configuration file

Here we add a discovery_timeout option to the configuration file, which is
allows you to set a default for the --discovery-timeout cli option.