Merge release branch 4.19 to 4.20

* 4.19:
  move sql code to the right file (#10035)

Author: DaanHoogland

engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql

@@ -70,6 +70,3 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user_data', 'removed', 'datetime COM
 UPDATE `cloud`.`configuration` SET
     `options` = 'FirstFitRouting,RandomAllocator,TestingAllocator,FirstFitAllocator,RecreateHostAllocator'
 WHERE `name` = 'host.allocators.order';
-
--- Add last_id to the volumes table
-CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('volumes','last_id', 'bigint(20) unsigned DEFAULT NULL');

engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql

@@ -18,3 +18,6 @@
 --;
 -- Schema upgrade from 4.19.1.0 to 4.19.2.0
 --;
+
+-- Add last_id to the volumes table
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.volumes', 'last_id', 'bigint(20) unsigned DEFAULT NULL');