Merge pull request #21045 from calavera/registry_config_options

Move registry service options to the daemon configuration.