Merge branch 'master' into jagilber

NuGet.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    </clear>
+    <clear />
     <add key="CollectServiceFabricData" value="https://servicefabricsupport.pkgs.visualstudio.com/Tools/_packaging/CollectServiceFabricData/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>