Merge "Replace deprecated function wfEscapeShellArg with Shell::escape()"