Integrating latest 47acbe8

Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp

@@ -12,6 +12,7 @@
 
 #include "EntityOwnershipServiceTestFixture.h"
 #include <AzCore/UserSettings/UserSettingsComponent.h>
+#include <AzFramework/Components/AzFrameworkConfigurationSystemComponent.h>
 
 namespace UnitTest
 {
@@ -45,6 +46,12 @@ namespace UnitTest
         {
             defaultRequiredComponents.erase(findComponentIterator);
         }
+        findComponentIterator = AZStd::find(defaultRequiredComponents.begin(), defaultRequiredComponents.end(),
+            azrtti_typeid<AzFramework::AzFrameworkConfigurationSystemComponent>());
+        if (findComponentIterator != defaultRequiredComponents.end())
+        {
+            defaultRequiredComponents.erase(findComponentIterator);
+        }
         return defaultRequiredComponents;
     }