Harden general settings form against newly discovered plugins

Luke Leberrequested to merge
issue/diff-3515557:3515557-harden-general-settings into 2.x

Closes #3515557

Merge request reports