Merge PR #19009 into master

* refs/pull/19009/head:
	client: Switch to new style config options and some cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/fuse_ll.cc
Simple merge

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge