Merge remote-tracking branch 'upstream/latest' into octane-dev-latest

# Conflicts:
#	HpToolsLauncher/Launcher.cs
#	HpToolsLauncher/Runners/FileSystemTestsRunner.cs
#	HpToolsLauncher/Runners/MBTRunner.cs

Author: Radislav Berkovich

HpToolsLauncher/ConsoleQuickEdit.cs

@@ -27,9 +27,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace HpToolsLauncher
@@ -51,8 +48,8 @@ public class ConsoleQuickEdit
         static extern bool SetConsoleMode(IntPtr hConsoleHandle, uint dwMode);
 
         private static bool SetNewConsoleMode(IntPtr consoleHandle, uint consoleMode)
-        {
-// set the new mode
+        {
+            // set the new mode
             if (!SetConsoleMode(consoleHandle, consoleMode))
             {
                 // ERROR: Unable to set console mode

HpToolsLauncher/ElevatedProcess.cs

@@ -27,11 +27,9 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace HpToolsLauncher
 {
@@ -51,7 +49,7 @@ public class ElevatedProcess : IDisposable
         private const uint STILL_ACTIVE = 259;
         private const uint INFINITE = 0xFFFFFFFF;
 
-        public ElevatedProcess(string path,string arguments,string workDirectory)
+        public ElevatedProcess(string path, string arguments, string workDirectory)
         {
             _path = path;
             _arguments = arguments;
@@ -105,14 +103,15 @@ public void StartElevated()
         {
             Process process = null;
             try
-            {
-               process = Process.GetProcessesByName("explorer").FirstOrDefault();
-            }catch(InvalidOperationException e)
+            {
+                process = Process.GetProcessesByName("explorer").FirstOrDefault();
+            }
+            catch (InvalidOperationException e)
             {
                 throw new ElevatedProcessException("An error has occurred while trying to find the 'explorer' process: ", e);
             }
 
-            if(process == null)
+            if (process == null)
             {
                 throw new ElevatedProcessException("No process with the name 'explorer' found!");
             }