Merge "Update wfEscapeShellArg() comments"