OpenZFS 7629 - Fix for 7290 neglected to remove some escape sequences

Authored by: John Wren Kennedy <john.kennedy@delphix.com>
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>

Porting Notes:
- Multiple changes in this commit were applied in c1d9abf.

OpenZFS-issue: https://www.illumos.org/issues/7629
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f5fb56d
Closes #5980

tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib

@@ -125,7 +125,7 @@ function setup_snap_env
 					# to disk before taking a snapshot.
 					#
 					if [[ $dtst == $VOL ]]; then
-						log_must $LOCKFS -f $TESTDIR1
+						log_must lockfs -f $TESTDIR1
 					fi
 				fi
 				log_must zfs snapshot $snap

tests/zfs-tests/tests/functional/mv_files/mv_files_common.kshlib

@@ -57,11 +57,11 @@ do
         (( i = i + 1 ))
 done
 
-\sleep 1
+sleep 1
 
 for pid in \$PIDS
 do
-	\wait \$pid
+	wait \$pid
         (( \$? == 127 )) && exit 1
 done
 exit 0