Merge branch 'develop' into gh-2680-fix-spark-packages-repo-priority

Author: GCHQDeveloper314

Diff for: core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java

@@ -1009,6 +1009,7 @@ private void addCoreOpHandlers() {
             addOperationHandler(GetJobDetails.class, new GetJobDetailsHandler());
             addOperationHandler(GetAllJobDetails.class, new GetAllJobDetailsHandler());
             addOperationHandler(GetJobResults.class, new GetJobResultsHandler());
+            addOperationHandler(CancelScheduledJob.class, new CancelScheduledJobHandler());
         }
 
         // Output
@@ -1065,7 +1066,6 @@ private void addCoreOpHandlers() {
         addOperationHandler(ToSingletonList.class, new ToSingletonListHandler());
         addOperationHandler(Reduce.class, new ReduceHandler());
         addOperationHandler(Join.class, new JoinHandler());
-        addOperationHandler(CancelScheduledJob.class, new CancelScheduledJobHandler());
 
         // Context variables
         addOperationHandler(SetVariable.class, new SetVariableHandler());

Diff for: core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java

@@ -651,7 +651,6 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin
                         ToSingletonList.class,
                         ForEach.class,
                         Reduce.class,
-                        CancelScheduledJob.class,
 
                         // Function
                         Filter.class,