Merge branch 'release-2.1.0'

Author: andreasohlund

GitVersionConfig.yaml

@@ -1 +1 @@
-assemblyVersioningScheme: Major
+assembly-versioning-scheme: Major

packaging/nuget/NServiceBus.RabbitMQ.nuspec

@@ -16,7 +16,7 @@
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies>
       <dependency id="NServiceBus" version="[5.0.0, 6.0.0)" />
-      <dependency id="RabbitMQ.Client" version="[3.3.5]" />
+      <dependency id="RabbitMQ.Client" version="[3.4.3]" />
     </dependencies>
   </metadata>
   <files>

src/NServiceBus.RabbitMQ.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.0.0/DataBus/When_sending_with_custom_IDataBus.cs

@@ -6,10 +6,10 @@ namespace NServiceBus.AcceptanceTests.Audit
     using AcceptanceTesting;
     using NUnit.Framework;
 
-    public class When_using_auditing_as_a_feature : NServiceBusAcceptanceTest
+    public class When_auditing : NServiceBusAcceptanceTest
     {
         [Test]
-        public void Message_should_not_be_forwarded_to_auditQueue_when_auditing_is_disabled()
+        public void Should_not_be_forwarded_to_auditQueue_when_auditing_is_disabled()
         {
             var context = new Context();
             Scenario.Define(context)
@@ -22,7 +22,7 @@ public void Message_should_not_be_forwarded_to_auditQueue_when_auditing_is_disab
         }
 
         [Test]
-        public void Message_should_be_forwarded_to_auditQueue_when_auditing_is_enabled()
+        public void Should_be_forwarded_to_auditQueue_when_auditing_is_enabled()
         {
             var context = new Context();
             Scenario.Define(context)