Merge branch 'release/6.1.1' into master

Author: Jaben

src/Papercut.Core/Infrastructure/Container/PapercutCoreModule.cs

@@ -62,17 +62,9 @@ protected override void Load(ContainerBuilder builder)
                         try
                         {
                             j.Instance.Load();
-                        }
-                        catch
-                        {
-                        }
-                    })
-                .OnRelease(
-                    j =>
-                    {
-                        try
-                        {
-                            j.Save();
+
+                            // immediately save all settings
+                            j.Instance.Save();
                         }
                         catch
                         {

src/Papercut.Service/Papercut.Service.Settings.json

@@ -7,12 +7,6 @@
   "HttpServerEnabled_Description": "## Is the Papercut Web UI Server enabled (Defaults to true)?",
   "IP": "Any",
   "IP_Description": "## SMTP Server listening IP. 'Any' is the default and it means '0.0.0.0'.",
-  "IPCommServerIPAddress": "127.0.0.1",
-  "IPCommServerIPAddress_Description": "## The IP Comm Server IP address (Defaults to 127.0.0.1).",
-  "IPCommServerPort": "37403",
-  "IPCommServerPort_Description": "## The IP Comm Server listening port (Defaults to 37403).",
-  "IPCommServerUIPort": "37402",
-  "IPCommServerUIPort_Description": "## The IP Comm Server UI listening port (Defaults to 37402).",
   "IPCommServiceAddress": "127.0.0.1",
   "IPCommServiceAddress_Description": "## The IP Comm Service IP address (Defaults to 127.0.0.1).",
   "IPCommServicePort": "37403",