Also updated the config schemas accordingly.
There's an existing core bug for the base query plugin not being correctly referenced by the config schema - #2836237 However everything else passes validation as far as config_inspector is concerned.
config_inspector
Closes #3529178