diff --git a/src/NServiceBus.NHibernate/ConfigureNHibernateGatewayDeduplication.cs b/src/NServiceBus.NHibernate/ConfigureNHibernateGatewayDeduplication.cs
index 6b4fb448212..4d0b3523485 100644
--- a/src/NServiceBus.NHibernate/ConfigureNHibernateGatewayDeduplication.cs
+++ b/src/NServiceBus.NHibernate/ConfigureNHibernateGatewayDeduplication.cs
@@ -1,7 +1,7 @@
 namespace NServiceBus
 {
     using Deduplication.NHibernate.Config;
-    using NHibernate.Cfg;
+    using global::NHibernate.Cfg;
     using Persistence.NHibernate;
 
     /// <summary>
diff --git a/src/NServiceBus.NHibernate/ConfigureNHibernateGatewayPersister.cs b/src/NServiceBus.NHibernate/ConfigureNHibernateGatewayPersister.cs
index 29e8a49d094..b6b6b835474 100644
--- a/src/NServiceBus.NHibernate/ConfigureNHibernateGatewayPersister.cs
+++ b/src/NServiceBus.NHibernate/ConfigureNHibernateGatewayPersister.cs
@@ -1,7 +1,7 @@
 namespace NServiceBus
 {
     using GatewayPersister.NHibernate.Config;
-    using NHibernate.Cfg;
+    using global::NHibernate.Cfg;
     using Persistence.NHibernate;
 
     /// <summary>
diff --git a/src/NServiceBus.NHibernate/ConfigureNHibernateSagaPersister.cs b/src/NServiceBus.NHibernate/ConfigureNHibernateSagaPersister.cs
index 1e7d79f0ed2..a7ac86d119e 100644
--- a/src/NServiceBus.NHibernate/ConfigureNHibernateSagaPersister.cs
+++ b/src/NServiceBus.NHibernate/ConfigureNHibernateSagaPersister.cs
@@ -4,7 +4,7 @@
     using System.Collections.Generic;
     using Config;
     using NHibernate;
-    using NHibernate.Cfg;
+    using global::NHibernate.Cfg;
     using Persistence.NHibernate;
     using SagaPersisters.NHibernate;
     using SagaPersisters.NHibernate.Config.Internal;
diff --git a/src/NServiceBus.NHibernate/ConfigureNHibernateSubscriptionStorage.cs b/src/NServiceBus.NHibernate/ConfigureNHibernateSubscriptionStorage.cs
index 1be509425d9..f003935f05d 100644
--- a/src/NServiceBus.NHibernate/ConfigureNHibernateSubscriptionStorage.cs
+++ b/src/NServiceBus.NHibernate/ConfigureNHibernateSubscriptionStorage.cs
@@ -3,7 +3,7 @@ namespace NServiceBus
     using System;
     using Config;
     using NHibernate;
-    using NHibernate.Cfg;
+    using global::NHibernate.Cfg;
     using Persistence.NHibernate;
     using Unicast.Subscriptions.NHibernate;
     using Unicast.Subscriptions.NHibernate.Config;
diff --git a/src/NServiceBus.NHibernate/ConfigureNHibernateTimeoutPersister.cs b/src/NServiceBus.NHibernate/ConfigureNHibernateTimeoutPersister.cs
index ac86c114f85..c870ffdf6cc 100644
--- a/src/NServiceBus.NHibernate/ConfigureNHibernateTimeoutPersister.cs
+++ b/src/NServiceBus.NHibernate/ConfigureNHibernateTimeoutPersister.cs
@@ -2,7 +2,7 @@ namespace NServiceBus
 {
     using System;
     using Config;
-    using NHibernate.Cfg;
+    using global::NHibernate.Cfg;
     using Persistence.NHibernate;
     using TimeoutPersisters.NHibernate;
     using TimeoutPersisters.NHibernate.Config;
diff --git a/src/NServiceBus.NHibernate/NServiceBus.NHibernate.csproj b/src/NServiceBus.NHibernate/NServiceBus.NHibernate.csproj
index 64036368bea..ab30855325d 100644
--- a/src/NServiceBus.NHibernate/NServiceBus.NHibernate.csproj
+++ b/src/NServiceBus.NHibernate/NServiceBus.NHibernate.csproj
@@ -47,6 +47,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NHibernate">
       <HintPath>..\packages\NHibernate\lib\Net35\NHibernate.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Obsolete">
       <HintPath>..\packages\Obsolete.Fody\Lib\NET35\Obsolete.dll</HintPath>
diff --git a/src/NServiceBus.sln.DotSettings b/src/NServiceBus.sln.DotSettings
index e66fc8ae4b4..7c5c8259183 100644
--- a/src/NServiceBus.sln.DotSettings
+++ b/src/NServiceBus.sln.DotSettings
@@ -73,6 +73,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/JavaScriptFormatOther/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CSharpMemberOrderPattern/CustomPattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-8" ?&gt;&#xD;
 &#xD;
@@ -337,6 +338,8 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>