Fixes added manually on top of bot's changes

Closes #3433600

src/Form/AdminSettingsForm.php

@@ -42,7 +42,7 @@ class AdminSettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    $instance = new static($container->get('config.factory'));
+    $instance = parent::create($container);
     $instance->entityTypeManager = $container->get('entity_type.manager');
     $instance->pluginManager = $container->get('plugin.manager.node_revision_delete');
     $instance->nodeRevisionDeleteBatch = $container->get('node_revision_delete.batch');