Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

AutomatedTesting/Gem/PythonCoverage/gem.json

@@ -1,6 +1,9 @@
 {
     "gem_name": "PythonCoverage",
     "display_name": "PythonCoverage",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Tool",
     "summary": "A tool for generating gem coverage for Python tests.",
     "canonical_tags": [
         "Gem"
@@ -9,5 +12,5 @@
         "PythonCoverage"
     ],
     "icon_path": "preview.png",
-    "restricted_name": "gems"
-}
+    "requirements": ""
+}

AutomatedTesting/Gem/gem.json

@@ -1,16 +1,12 @@
 {
-    "GemFormatVersion": 4,
-    "Uuid": "afc25e1593194d6283d9ff744ab6d5a1",
-    "Name": "AutomatedTesting",
-    "DisplayName": "AutomatedTesting",
-    "Version": "0.1.0",
-    "Summary": "A short description of my Gem.",
-    "Tags": ["Game"],
-    "IconPath": "preview.png",
-    "IsGameGem": true,
-    "Modules": [
-        {
-            "Type": "GameModule"
-        }
-    ]
+    "gem_name": "AutomatedTesting",
+    "display_name": "AutomatedTesting",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Amazon Web Services, Inc.",
+    "type": "Code",
+    "summary": "Project Gem for customizing the AutomatedTesting project functionality.",
+    "canonical_tags": ["Gem"],
+    "user_tags": [],
+    "icon_path": "preview.png",
+    "requirements": ""
 }