Issue #3230829 by mohit_aghera, marcvangend, Wim Leers, Kristen Pol:...
Issue #3230829 by mohit_aghera, marcvangend, Wim Leers, Kristen Pol: editor_form_filter_format_form_alter() does not remove "editor_plugin" from form state when needed
(cherry picked from commit a76814b0)