3040556 - 11.x version

Closes #3040556

core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php

@@ -220,12 +220,11 @@ public function isUninstalling() {
   /**
    * {@inheritdoc}
    */
-  public function createDuplicate() {
-    $duplicate = parent::createDuplicate();
+  public function postDuplicate(EntityStorageInterface $storage) {
+    parent::postDuplicate($storage);
 
     // Prevent the new duplicate from being misinterpreted as a rename.
-    $duplicate->setOriginalId(NULL);
-    return $duplicate;
+    $this->setOriginalId(NULL);
   }
 
   /**