Merge 10.3 into 10.4

mysql-test/suite/maria/repair.test

+# We should not run this test with embedded as we are using
+# max_session_mem_used, which causes things to fail/not fail randomly
+# as memory usage is different compared to normal server.
+
+--source include/not_embedded.inc
+
 #
 # MDEV-11539 test_if_reopen: Assertion `strcmp(share->unique_file_name,filename) || share->last_version' failed upon select from I_S
 #