Merge branch '11.4' into 11.8

Author: sanja-byelkin

mysql-test/suite/galera/r/galera_sst_mariabackup_encrypt_with_key_server.result

@@ -24,3 +24,5 @@ connection node_2;
 FOUND 1 /Invalid value for WSREP_SST_OPT_REMOTE_USER/ in mysqld.1.err
 # cleanup
 # restart
+connection node_2;
+call mtr.add_suppression("Removing");

mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.test

@@ -60,3 +60,6 @@ call mtr.add_suppression('Removing .*/xtrabackup_galera_info file due to signal'
 --exec echo ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem >> $MYSQLTEST_VARDIR/my.cnf
 --exec echo ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem >> $MYSQLTEST_VARDIR/my.cnf
 --source $MYSQL_TEST_DIR/include/start_mysqld.inc
+
+--connection node_2
+call mtr.add_suppression("Removing");