commit 66d5a2acd2a0d0e6b74a4e2972db9e1737c234ca
Author: Joel Pittet <joel@pittet.ca>
Date:   Sat May 31 20:33:35 2014 -0500

    fixed the block list and the block name

diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 37b93bd..d7b809d 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -71,9 +71,9 @@ function block_theme() {
       'render element' => 'elements',
       'template' => 'block',
     ),
-    'block_list' => array(
+    'form__block_list' => array(
       'render element' => 'form',
-      'template' => 'block-list',
+      'template' => 'form--block-list',
     ),
   );
 }
diff --git a/core/modules/block/src/BlockListBuilder.php b/core/modules/block/src/BlockListBuilder.php
index e55d6e8..6e8d108 100644
--- a/core/modules/block/src/BlockListBuilder.php
+++ b/core/modules/block/src/BlockListBuilder.php
@@ -144,7 +144,7 @@ public function buildForm(array $form, array &$form_state) {
       );
     }
     $entities = $this->load();
-    $form['#theme'] = array('block_list');
+    $form['#theme'] = array('form__block_list');
     $form['#attached']['library'][] = 'core/drupal.tableheader';
     $form['#attached']['library'][] = 'block/drupal.block';
     $form['#attached']['library'][] = 'block/drupal.block.admin';
diff --git a/core/modules/block/templates/block-list.html.twig b/core/modules/block/templates/block-list.html.twig
deleted file mode 100644
index 474c654..0000000
--- a/core/modules/block/templates/block-list.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{#
-/**
- * @file
- * Two column template for the block add/edit form.
- *
- * This template will be used when a block edit form specifies 'block_edit_form'
- * as its #theme callback.  Otherwise, by default, block add/edit forms will be
- * themed by theme_form().
- *
- * Available variables:
- * - form: The block add/edit form.
- *
- * @ingroup themeable
- */
-#}
-<div class="layout-block-list clearfix">
-  <div class="layout-region block-list-primary">
-    {{ form|without('place_blocks') }}
-  </div>
-  <div class="layout-region block-list-secondary">
-    {{ form.place_blocks }}
-  </div>
-</div>
diff --git a/core/modules/block/templates/form--block-list.html.twig b/core/modules/block/templates/form--block-list.html.twig
new file mode 100644
index 0000000..1cb1696
--- /dev/null
+++ b/core/modules/block/templates/form--block-list.html.twig
@@ -0,0 +1,26 @@
+{% extends "@system/form.html.twig" %}
+{#
+/**
+ * @file
+ * Two column template for the block add/edit form.
+ *
+ * This template will be used when a block edit form specifies 'block_edit_form'
+ * as its #theme callback.  Otherwise, by default, block add/edit forms will be
+ * themed by theme_form().
+ *
+ * Available variables:
+ * - form: The block add/edit form.
+ *
+ * @ingroup themeable
+ */
+#}
+{% block form %}
+  <div class="layout-block-list clearfix">
+    <div class="layout-region block-list-primary">
+      {{ form|without('place_blocks') }}
+    </div>
+    <div class="layout-region block-list-secondary">
+      {{ form.place_blocks }}
+    </div>
+  </div>
+{% endblock %}
diff --git a/core/modules/system/templates/form.html.twig b/core/modules/system/templates/form.html.twig
index 3a8f6b0..cfe1dbc 100644
--- a/core/modules/system/templates/form.html.twig
+++ b/core/modules/system/templates/form.html.twig
@@ -13,7 +13,7 @@
  */
 #}
 <form{{ attributes }}>
-  {% block content %}
+  {% block form %}
     {{ form }}
   {% endblock %}
 </form>