Merge 10.1 into 10.2

scripts/convert-debug-for-diff.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -i
+#!/usr/bin/env perl -i
 #
 # This script converts all numbers that look like addresses or memory sizes,
 # in a debug files generated by --debug (like mysqld --debug-dbug), to #.

scripts/mytop.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 #
 # $Id: mytop,v 1.91 2012/01/18 16:49:12 mgrennan Exp $