Issue #2096703 by mondrake, tim.plunkett | tstoeckler: Image toolkits should use PluginFormInterface and ContainerFactoryPluginInterface.