only in patch2:
unchanged:
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -120,7 +120,7 @@ function comment_uri(CommentInterface $comment) {
 function comment_entity_extra_field_info() {
   $return = array();
   foreach (CommentType::loadMultiple() as $comment_type) {
-    $return['comment'][$comment_type->id] = array(
+    $return['comment'][$comment_type->id()] = array(
       'form' => array(
         'author' => array(
           'label' => t('Author'),
only in patch2:
unchanged:
--- a/core/modules/comment/config/schema/comment.schema.yml
+++ b/core/modules/comment/config/schema/comment.schema.yml
@@ -47,6 +47,12 @@ comment.type.*:
   type: config_entity
   label: 'Comment type settings'
   mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
     target_entity_type_id:
       type: string
       label: 'Target Entity Type ID'
only in patch2:
unchanged:
--- a/core/modules/comment/src/CommentTypeForm.php
+++ b/core/modules/comment/src/CommentTypeForm.php
@@ -82,7 +82,7 @@ public function form(array $form, array &$form_state) {
 
     $form['description'] = array(
       '#type' => 'textarea',
-      '#default_value' => $comment_type->description,
+      '#default_value' => $comment_type->getDescription(),
       '#description' => t('Describe this comment type. The text will be displayed on the <em>Comment types</em> administration overview page'),
       '#title' => t('Description'),
     );
only in patch2:
unchanged:
--- a/core/modules/comment/src/Entity/CommentType.php
+++ b/core/modules/comment/src/Entity/CommentType.php
@@ -47,28 +47,28 @@ class CommentType extends ConfigEntityBundleBase implements CommentTypeInterface
    *
    * @var string
    */
-  public $id;
+  protected $id;
 
   /**
    * The comment type label.
    *
    * @var string
    */
-  public $label;
+  protected $label;
 
   /**
    * The description of the comment type.
    *
    * @var string
    */
-  public $description;
+  protected $description;
 
   /**
    * The target entity type.
    *
    * @var string
    */
-  public $target_entity_type_id;
+  protected $target_entity_type_id;
 
   /**
    * {@inheritdoc}