Mariabackup: Test file cleanup

mysql-test/suite/mariabackup/include/restart_and_restore.inc

-let $_server_id= `SELECT @@server_id`;
 let $_datadir= `SELECT @@datadir`;
-let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect;
-exec echo "wait" > $_expect_file_name;
 echo # shutdown server;
-shutdown_server;
+--source include/shutdown_mysqld.inc
 echo # remove datadir;
 rmdir $_datadir;
 echo # xtrabackup move back;
 exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2 --throttle=1;
 echo # restart server;
-exec echo "restart" > $_expect_file_name;
-enable_reconnect;
-source include/wait_until_connected_again.inc;
-disable_reconnect;
+--source include/start_mysqld.inc

mysql-test/suite/mariabackup/xb_compressed_encrypted.test

 source include/have_file_key_management.inc;
 
 CREATE TABLE t1(c1 INT, b VARCHAR(2400), index(b(100),c1)) ENGINE=INNODB ROW_FORMAT=compressed ENCRYPTED=YES;
- 
+
 DELIMITER //;
 CREATE PROCEDURE innodb_insert_proc (REPEAT_COUNT INT)
 BEGIN
@@ -14,12 +14,12 @@ BEGIN
 END//
 DELIMITER ;//
 COMMIT;
- 
+
 SET AUTOCOMMIT=0;
 CALL innodb_insert_proc(50000);
 COMMIT;
 
-                                                                                                                                           
+
 echo # xtrabackup backup;
 --disable_result_log
 let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;