Merge pull request #4588 from dotnet/publish-8788

Merge master into live

Author: BillWagner

docfx.json

@@ -44,7 +44,7 @@
       "ms.author": "dotnetcontent",
       "ms.date": "04/30/2018",
       "searchScope": [".NET"],
-      "uhfHeaderId": [],
+      "uhfHeaderId": "MSDocsHeader-DotNet",
       "apiPlatform": "dotnet",
       "ms.topic": "managed-reference",
       "ms.prod": "dotnet-api",