Integrating github/staging through commit 5f214be

AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py

@@ -39,7 +39,7 @@ def Docking_Pane():
      5) Close Script Canvas window
 
     Note:
-     - This test file must be called from the Lumberyard Editor command terminal
+     - This test file must be called from the Open 3D Engine Editor command terminal
      - Any passed and failed tests are written to the Editor.log file.
         Parsing the file or running a log_monitor are required to observe the test results.
 
@@ -55,7 +55,7 @@ def Docking_Pane():
     from utils import TestHelper as helper
     import pyside_utils
 
-    # Lumberyard imports
+    # Open 3D Engine imports
     import azlmbr.legacy.general as general
 
     # Pyside imports