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

src/Services/Catalog/Catalog.API/CatalogSettings.cs

@@ -7,6 +7,7 @@
         public string EventBusConnection { get; set; }
 
         public bool UseCustomizationData { get; set; }
-	public bool AzureStorageEnabled { get; set; }
+
+        public bool AzureStorageEnabled { get; set; }
     }
 }

src/Services/Catalog/Catalog.API/IntegrationEvents/Events/OrderStatusChangedToPaidIntegrationEvent.cs

@@ -1,7 +1,7 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events
 {
-    using System.Collections.Generic;
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+    using System.Collections.Generic;
 
     public class OrderStatusChangedToPaidIntegrationEvent : IntegrationEvent
     {

src/Services/Catalog/Catalog.API/Proto/catalog.proto

@@ -10,6 +10,7 @@ package CatalogApi;
 message CatalogItemRequest {
 	int32 id = 1;
 }
+
 message CatalogItemsRequest {
 	string ids = 1;
 	int32 pageSize = 2;

src/Services/Catalog/Catalog.FunctionalTests/CatalogScenarioBase.cs

@@ -1,4 +1,3 @@
-using Autofac.Extensions.DependencyInjection;
 using Catalog.API.Extensions;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;