Merge more of Baron's changes, also re-implement the MySQL Executables section

Plus other bugfixes.

t/lib/bash/collect_mysql_info.sh

@@ -28,7 +28,7 @@ wait
 
 file_count=$(ls "$p" | wc -l)
 
-is $file_count 12 "Creates the correct number of files (without --databases)"
+is $file_count 14 "Creates the correct number of files (without --databases)"
 
 awk '{print $1}' "$p/mysqld-instances" > "$TMPDIR/collect_mysqld_instances1.test"
 ps ww -p "$(_pidof mysqld | sed -e "s/ /,/g")" | awk '{print $1}' > "$TMPDIR/collect_mysqld_instances2.test"

t/lib/bash/summary_common.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-plan 9
+plan 10
 
 TMPDIR="$TEST_TMPDIR"
 PATH="$PATH:$PERCONA_TOOLKIT_SANDBOX/bin"
@@ -59,7 +59,21 @@ is \
    "40"                \
    "get_var works on a status dump"
 
+cat <<EOF > "$p"
+internal::nice_of_2750    0
+internal::nice_of_2571    0
+internal::nice_of_2406    0
+
+EOF
+
+is \
+   "$(get_var "internal::nice_of_2750" "$p")" \
+   "0"                \
+   "get_var doesn't get confused if \$2 is also found inside \$1"
+
+# setup_data_dir
 
 dies_ok \
    "setup_data_dir $PERCONA_TOOLKIT_BRANCH" \
    "setup_data_dir dies if passed a populated directory" 2>/dev/null
+