MC-33699: Stabilize MFTF tests

Author: DianaRusin

app/code/Magento/Catalog/etc/events.xml

@@ -42,7 +42,6 @@
     </event>
     <event name="magento_catalog_api_data_categorytreeinterface_save_after">
         <observer name="legacy_categorytree_save_after" instance="Magento\Framework\EntityManager\Observer\AfterEntitySave" />
-        <observer name="invalidate_cache_on_categorytree_design_change" instance="Magento\Catalog\Observer\InvalidateCacheOnCategoryDesignChange" />
     </event>
     <event name="magento_catalog_api_data_categorytreeinterface_delete_before">
         <observer name="legacy_categorytree_delete_before" instance="Magento\Framework\EntityManager\Observer\BeforeEntityDelete" />

app/code/Magento/User/Observer/Backend/AuthObserver.php

@@ -21,6 +21,7 @@
 /**
  * User backend observer model for authentication
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AuthObserver implements ObserverInterface
 {
@@ -184,6 +185,7 @@ private function _updateLockingInformation($user)
 
     /**
      * Check whether the latest password is expired
+     *
      * Side-effect can be when passwords were changed with different lifetime configuration settings
      *
      * @param array $latestPassword

lib/internal/Magento/Framework/EntityManager/TypeResolver.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\EntityManager;
 
+use Magento\Catalog\Model\Category;
+
 /**
  * Resolves types.
  */
@@ -54,7 +56,7 @@ public function resolve($type)
         $interfaceNames = $reflectionClass->getInterfaceNames();
         $dataInterfaces = [];
         foreach ($interfaceNames as $interfaceName) {
-            if (strpos($interfaceName, '\Api\Data\\') !== false) {
+            if ($this->isDataInterface($interfaceName, $type)) {
                 $dataInterfaces[] = $interfaceName;
             }
         }
@@ -73,4 +75,17 @@ public function resolve($type)
         }
         return $this->typeMapping[$className];
     }
+
+    /**
+     * Checks whether interface has Data type.
+     *
+     * @param string $interfaceName
+     * @param object $entityType
+     * @return bool
+     */
+    private function isDataInterface(string $interfaceName, $entityType): bool
+    {
+        return strpos($interfaceName, '\Api\Data\\') !== false
+            && (!$entityType instanceof Category || preg_match('/Category(?!Tree)/', $interfaceName));
+    }
 }