Integrating latest from github/staging

Integrating up through commit 5e1bdae

AutomatedTesting/TestAssets/test_chunks_builder.py

@@ -10,6 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 import azlmbr.scene as sceneApi
 from scene_api import scene_data as sceneData
+import uuid
 
 def update_manifest(scene):
     graph = sceneData.SceneGraph(scene.graph)
@@ -27,7 +28,9 @@ def update_manifest(scene):
     sceneManifest = sceneData.SceneManifest()
 
     for activeMeshIndex in range(len(chunkNameList)):
-        meshGroup = sceneManifest.add_mesh_group(chunkNameList[activeMeshIndex])
+        chunkName = chunkNameList[activeMeshIndex]
+        meshGroup = sceneManifest.add_mesh_group(chunkName)
+        meshGroup['id'] = '{' + str(uuid.uuid5(uuid.NAMESPACE_DNS, scene.sourceFilename + chunkName)) + '}'
         sceneManifest.mesh_group_add_comment(meshGroup, 'auto generated by test_chunks_builder')
         sceneManifest.mesh_group_set_origin(meshGroup, None, 0, 0, 0, 1.0)
         for meshIndex in range(len(chunkNameList)):