Fixes #3921 - Make choice of discovery fact name a setting
Fixed 500 error on reboot