24a7cf3
Fix client discovery and make sure command line options are not overwritten with discovered options, just verified.