Merge 10.1 into 10.2

Temporarily disable a test for
commit 2175bfce3e
because fixing it in 10.2 requires updating libmariadb.

support-files/mysql.server.sh

@@ -185,7 +185,11 @@ fi
 user='@MYSQLD_USER@'
 
 su_kill() {
-  su - $user -s /bin/sh -c "kill $*" >/dev/null 2>&1
+  if test "$USER" = "$user"; then
+    kill $* >/dev/null 2>&1
+  else
+    su - $user -s /bin/sh -c "kill $*" >/dev/null 2>&1
+  fi
 }
 
 #