Merge pull request #1086 from microsoft/vnext

Merge dev into master

Author: MaggieKimani1

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -349,7 +349,8 @@ public static async Task<OpenApiDocument> ConvertCsdlToOpenApi(Stream csdl, stri
                 ShowLinks = false,
                 ExpandDerivedTypesNavigationProperties = false,
                 EnableCount = true,
-                UseSuccessStatusCodeRange = true
+                UseSuccessStatusCodeRange = true,
+                EnableTypeDisambiguationForDefaultValueOfOdataTypeProperty = true
             };
             config.GetSection("OpenApiConvertSettings").Bind(settings);