[GIT PULL] scftorture changes for v6.4