Merge "Remove title protection correctly for undeletions and imports"

diff --combined includes/Storage/DerivedPageDataUpdater.php
index ca99a7b,f49ea60..4903cf0
--- 1/includes/Storage/DerivedPageDataUpdater.php
--- 2/includes/Storage/DerivedPageDataUpdater.php
+++ b/includes/Storage/DerivedPageDataUpdater.php
@@@ -659,7 -659,7 +659,7 @@@ class DerivedPageDataUpdater implement
                        $hasLinks = (bool)count( $this->getCanonicalParserOutput()->getLinks() );
                }
  
 -              foreach ( $this->getModifiedSlotRoles() as $role ) {
 +              foreach ( $this->getSlots()->getSlotRoles() as $role ) {
                        $roleHandler = $this->slotRoleRegistry->getRoleHandler( $role );
                        if ( $roleHandler->supportsArticleCount() ) {
                                $content = $this->getRawContent( $role );
@@@ -1208,7 -1208,8 +1208,8 @@@
                }
  
                // "created" is forced here
-               $this->options['created'] = ( $this->pageState['oldId'] === 0 );
+               $this->options['created'] = ( $this->options['created'] ||
+                                               ( $this->pageState['oldId'] === 0 ) );
  
                $this->revision = $revision;