Add Dylan's patch from MR 1750, so the feedbackd configuration can use
this for the device specific configuration.

[ci:skip-build]: built locally