Integrating latest from github/staging

Integrating up through commit 5e1bdae

Gems/Prefab/PrefabBuilder/CMakeLists.txt

@@ -16,7 +16,6 @@ endif()
 ly_add_target(
     NAME Prefab.PrefabBuilder MODULE
     NAMESPACE Gem
-    OUTPUT_NAME Gem.Prefab.PrefabBuilder
     FILES_CMAKE
         prefabbuilder_files.cmake
     BUILD_DEPENDENCIES
@@ -31,6 +30,6 @@ ly_add_target_dependencies(
         AssetBuilder
         AssetProcessor
         AssetProcessorBatch
-    DEPENDENCIES_FILES
-        prefabbuilder_dependencies.cmake
+    DEPENDENT_TARGETS
+        Gem::Prefab.PrefabBuilder
 )

Gems/Prefab/PrefabBuilder/prefabbuilder_dependencies.cmake

@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-set(GEM_DEPENDENCIES Gem::Prefab.PrefabBuilder)

Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake

@@ -10,6 +10,5 @@
 #
 
 set(FILES
-    prefabbuilder_dependencies.cmake
     PrefabBuilderModule.cpp
 )