Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp

Code/Framework/GridMate/GridMate/GridMate.cpp

@@ -6,6 +6,7 @@
  *
  */
 
+#include <AzCore/Debug/Budget.h>
 #include <AzCore/Memory/AllocationRecords.h>
 #include <AzCore/std/hash.h>
 
@@ -14,6 +15,8 @@
 #include <GridMate/GridMateEventsBus.h>
 #include <GridMate/Version.h>
 
+AZ_DEFINE_BUDGET(GridMate);
+
 namespace GridMate
 {
     class GridMateImpl

Code/Framework/GridMate/GridMate/Replica/ReplicaDefs.h

@@ -5,11 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#ifndef GM_REPLICADEFS_H
-#define GM_REPLICADEFS_H
-
-/// \file ReplicaChunk.h
+#pragma once
 
+#include <AzCore/Debug/Budget.h>
 #include <AzCore/Math/Crc.h>
 
 namespace GridMate
@@ -80,4 +78,5 @@ namespace GridMate
     static const ZoneMask ZoneMask_All = (ZoneMask) - 1;
 }   // namespace Gridmate
 
-#endif // GM_REPLICADEFS_H
+AZ_DECLARE_BUDGET(GridMate);
+

Code/Framework/GridMate/GridMate/Replica/Tasks/ReplicaMarshalTasks.cpp

@@ -6,8 +6,6 @@
  *
  */
 
-#include <AzCore/Debug/Profiler.h>
-
 #include <GridMate/Replica/SystemReplicas.h>
 #include <GridMate/Replica/Tasks/ReplicaMarshalTasks.h>
 #include <GridMate/Replica/ReplicaDrillerEvents.h>

Code/Framework/GridMate/Tests/gridmate_test_files.cmake

@@ -8,7 +8,6 @@
 
 set(FILES
     test_Main.cpp
-    TestProfiler.cpp
     Tests.h
     Session.cpp
     Serialize.cpp
@@ -16,7 +15,6 @@ set(FILES
     ReplicaSmall.cpp
     ReplicaMedium.cpp
     ReplicaBehavior.cpp
-    Replica.cpp
     StreamSecureSocketDriverTests.cpp
     StreamSocketDriverTests.cpp
     CarrierStreamSocketDriverTests.cpp