Fixes #3921 - Make choice of discovery fact name a setting

@lzap thoughts? @mmol care to test drive? :)