diff --git a/Bundle/pom.xml b/Bundle/pom.xml
index ab6f64af..ba16aa76 100644
--- a/Bundle/pom.xml
+++ b/Bundle/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>2.6.1</version>
+        <version>2.6.2</version>
     </parent>
 
     <artifactId>openas2-osgi</artifactId>
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 1fa13dbb..b82f68e3 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,18 +1,20 @@
 #              OpenAS2 Server
-#              Version 2.6.1
+#              Version 2.6.2
 #              RELEASE NOTES
 -----
-The OpenAS2 project is pleased to announce the release of OpenAS2 2.6.1
+The OpenAS2 project is pleased to announce the release of OpenAS2 2.6.2
 
-The release download file is: OpenAS2Server-2.6.1.zip
+The release download file is: OpenAS2Server-2.6.2.zip
 
 The zip file contains a PDF document (OpenAS2HowTo.pdf) providing information on installing and using the application.
 
-Version 2.6.1 - 2018-09-09
+Version 2.6.2 - 2018-09-26
 This is a minor enhancement release:
        **IMPORTANT NOTE**: Please review upgrade notes below if you are upgrading
 
-  1. Allow MDN subject to use filename parsing functionality to set the text.
+  1. Provide ability to use restricted headers in HTTP with partnership level overrides for the "Content-Transfer-Encoding" header
+  2. Allow unsigned MDN to be sent using the "none" keyword for the "as2_mdn_options" attribute
+  3. Use a Java 7 compatible method call for a Map class method that required Java 8
 
 ##Upgrade Notes
  See the openAS2HowTo appendix for the general process on upgrading OpenAS2.
@@ -24,6 +26,7 @@ This is a minor enhancement release:
       1. Change the name of the MDN sender module from "AsynchMDNSenderModule" to "MDNSenderModule" in the config.xml if using your existing config.xml file in the upgrade. If "AsynchMDNSenderModule" is not in the config then add the following: <module classname="org.openas2.processor.sender.MDNSenderModule" retries="3"/>
       2. Change the name of the partnership attribute "messageid" to "as2_message_id_format" if used in any partnership definition.
       3. Change the "as2_mdn_options" attribute to use $attribute.sign$ instead of hard coded signing algorithm
+      4. If you experience issues with partners failing that were working in the previous version, check the troubleshooting section of the OpenAS2HowTo guide - specifically the issues around Content Transfer Encoding and Content Length/Chunking
 
 
 ### If upgrading from versions older than 2.4.1:
diff --git a/Remote/pom.xml b/Remote/pom.xml
index b494c03b..362d7d68 100644
--- a/Remote/pom.xml
+++ b/Remote/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>2.6.1</version>
+        <version>2.6.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/Server/pom.xml b/Server/pom.xml
index 76e2b52d..643d959c 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>net.sf.openas2</groupId>
 		<artifactId>OpenAS2</artifactId>
-		<version>2.6.1</version>
+		<version>2.6.2</version>
 	</parent>
 
 	<artifactId>openas2-server</artifactId>
diff --git a/Server/src/main/java/org/openas2/partner/Partnership.java b/Server/src/main/java/org/openas2/partner/Partnership.java
index aa59d026..4ae71dc0 100644
--- a/Server/src/main/java/org/openas2/partner/Partnership.java
+++ b/Server/src/main/java/org/openas2/partner/Partnership.java
@@ -24,7 +24,9 @@ public class Partnership implements Serializable {
 
     /* partnership definition attributes */
     public static final String PA_SUBJECT = "subject"; // Subject sent in messages    
+    public static final String PA_CONTENT_TYPE = "content_type"; // optional content type for mime parts
     public static final String PA_CONTENT_TRANSFER_ENCODING = "content_transfer_encoding"; // optional content transfer enc value
+    public static final String PA_SET_CONTENT_TRANSFER_ENCODING_HTTP = "set_content_transfer_encoding_http_header"; // See as an HTTP header
     public static final String PA_REMOVE_PROTECTION_ATTRIB = "remove_cms_algorithm_protection_attrib"; // Some AS2 systems do not support the attribute
     public static final String PA_SET_CONTENT_TRANSFER_ENCODING_OMBP = "set_content_transfer_encoding_on_outer_mime_bodypart"; // optional content transfer enc value
 	public static final String PA_RESEND_REQUIRES_NEW_MESSAGE_ID = "resend_requires_new_message_id"; // list of nme/value pairs for setting custom mime headers
diff --git a/Server/src/main/java/org/openas2/processor/msgtracking/EmbeddedDBHandler.java b/Server/src/main/java/org/openas2/processor/msgtracking/EmbeddedDBHandler.java
index abaebfe5..99de1bd5 100644
--- a/Server/src/main/java/org/openas2/processor/msgtracking/EmbeddedDBHandler.java
+++ b/Server/src/main/java/org/openas2/processor/msgtracking/EmbeddedDBHandler.java
@@ -1,125 +1,126 @@
-package org.openas2.processor.msgtracking;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.Nullable;
-
-import org.h2.jdbcx.JdbcConnectionPool;
-import org.h2.tools.Server;
-import org.openas2.OpenAS2Exception;
-
-class EmbeddedDBHandler extends DbTrackingModule implements IDBHandler {
-
-    @Nullable
-    private JdbcConnectionPool cp = null;
-
-    private Server server = null;
-
-    private String connectString = "jdbc:h2:file:DB/openas2";
-
-    public void createConnectionPool(String connectString, String userName, String pwd) throws OpenAS2Exception
-    {
-        // Check that a connection pool is not already running
-        if (cp != null)
-        {
-            throw new OpenAS2Exception(
-                    "Connection pool already initialized. Cannot create a new connection pool. Stop current one first. DB connect string:"
-                            + connectString + " :: Active pool connect string: " + this.connectString);
-        }
-        this.connectString = connectString;
-
-        cp = JdbcConnectionPool.create(connectString, userName, pwd);
-    }
-
-	public void start(String connectString, String userName, String pwd, Map<String, String> params) throws OpenAS2Exception
-	{
-		createConnectionPool(connectString, userName, pwd);
-		if ("true".equalsIgnoreCase(params.getOrDefault(PARAM_TCP_SERVER_START, "true")))
-		{
-			String tcpPort = params.get(PARAM_TCP_SERVER_PORT);
-			if (tcpPort == null || tcpPort.length() < 1) tcpPort = "9092";
-			String tcpPwd = params.get(PARAM_TCP_SERVER_PWD);
-			if (tcpPwd == null || tcpPwd.length() < 1) tcpPwd = "OpenAS2";
-			String dbDirectory = params.get(PARAM_DB_DIRECTORY);
-			if (dbDirectory == null || dbDirectory.length() < 1)
-				throw new OpenAS2Exception("TCP server requireds parameter: " + PARAM_DB_DIRECTORY);
-					
-			try
-			{
-				server = Server.createTcpServer( "-tcpPort", tcpPort, "-tcpPassword", tcpPwd, "-baseDir", dbDirectory, "-tcpAllowOthers").start();
-			} catch (SQLException e)
-			{
-				throw new OpenAS2Exception("Failed to start TCP server", e);
-			}
-		}
-	}
-
-	public void stop()
-	{
-			// Stopping the TCP server will stop the database so only do one of them
-			if (server != null)
-			{
-                server.stop();
-            }
-			else
-			{
-					try
-					{
-						shutdown(connectString);
-					} catch (Exception e)
-					{
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-					destroyConnectionPool();
-			}
-	}
-
-	public void destroyConnectionPool()
-    {
-        if (cp == null)
-        {
-            return;
-        }
-        cp.dispose();
-        cp = null;
-    }
-
-    public Connection getConnection() throws SQLException, OpenAS2Exception
-    {
-        // Check that a connection pool is running
-        if (cp == null)
-        {
-            throw new OpenAS2Exception("Connection pool not initialized.");
-        }
-        return cp.getConnection();
-    }
-
-    public boolean shutdown(String connectString) throws SQLException, OpenAS2Exception
-    {
-        // Wait briefly if there are active connections
-        int waitCount = 0;
-        try
-        {
-            while (cp != null && cp.getActiveConnections() > 0 && waitCount < 10)
-            {
-                TimeUnit.MILLISECONDS.sleep(100);
-                waitCount++;
-            }
-        } catch (InterruptedException e)
-        {
-            // Do nothing
-        }
-        Connection c = getConnection();
-        Statement st = c.createStatement();
-
-        boolean result = st.execute("SHUTDOWN");
-        c.close();
-        return result;
-    }
-
-}
+package org.openas2.processor.msgtracking;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Nullable;
+
+import org.h2.jdbcx.JdbcConnectionPool;
+import org.h2.tools.Server;
+import org.openas2.OpenAS2Exception;
+
+class EmbeddedDBHandler extends DbTrackingModule implements IDBHandler {
+
+    @Nullable
+    private JdbcConnectionPool cp = null;
+
+    private Server server = null;
+
+    private String connectString = "jdbc:h2:file:DB/openas2";
+
+    public void createConnectionPool(String connectString, String userName, String pwd) throws OpenAS2Exception
+    {
+        // Check that a connection pool is not already running
+        if (cp != null)
+        {
+            throw new OpenAS2Exception(
+                    "Connection pool already initialized. Cannot create a new connection pool. Stop current one first. DB connect string:"
+                            + connectString + " :: Active pool connect string: " + this.connectString);
+        }
+        this.connectString = connectString;
+
+        cp = JdbcConnectionPool.create(connectString, userName, pwd);
+    }
+
+	public void start(String connectString, String userName, String pwd, Map<String, String> params) throws OpenAS2Exception
+	{
+		createConnectionPool(connectString, userName, pwd);
+		String isStartSrvr = params.get(PARAM_TCP_SERVER_START);
+		if (isStartSrvr == null || "true".equalsIgnoreCase(isStartSrvr))
+		{
+			String tcpPort = params.get(PARAM_TCP_SERVER_PORT);
+			if (tcpPort == null || tcpPort.length() < 1) tcpPort = "9092";
+			String tcpPwd = params.get(PARAM_TCP_SERVER_PWD);
+			if (tcpPwd == null || tcpPwd.length() < 1) tcpPwd = "OpenAS2";
+			String dbDirectory = params.get(PARAM_DB_DIRECTORY);
+			if (dbDirectory == null || dbDirectory.length() < 1)
+				throw new OpenAS2Exception("TCP server requireds parameter: " + PARAM_DB_DIRECTORY);
+					
+			try
+			{
+				server = Server.createTcpServer( "-tcpPort", tcpPort, "-tcpPassword", tcpPwd, "-baseDir", dbDirectory, "-tcpAllowOthers").start();
+			} catch (SQLException e)
+			{
+				throw new OpenAS2Exception("Failed to start TCP server", e);
+			}
+		}
+	}
+
+	public void stop()
+	{
+			// Stopping the TCP server will stop the database so only do one of them
+			if (server != null)
+			{
+                server.stop();
+            }
+			else
+			{
+					try
+					{
+						shutdown(connectString);
+					} catch (Exception e)
+					{
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					destroyConnectionPool();
+			}
+	}
+
+	public void destroyConnectionPool()
+    {
+        if (cp == null)
+        {
+            return;
+        }
+        cp.dispose();
+        cp = null;
+    }
+
+    public Connection getConnection() throws SQLException, OpenAS2Exception
+    {
+        // Check that a connection pool is running
+        if (cp == null)
+        {
+            throw new OpenAS2Exception("Connection pool not initialized.");
+        }
+        return cp.getConnection();
+    }
+
+    public boolean shutdown(String connectString) throws SQLException, OpenAS2Exception
+    {
+        // Wait briefly if there are active connections
+        int waitCount = 0;
+        try
+        {
+            while (cp != null && cp.getActiveConnections() > 0 && waitCount < 10)
+            {
+                TimeUnit.MILLISECONDS.sleep(100);
+                waitCount++;
+            }
+        } catch (InterruptedException e)
+        {
+            // Do nothing
+        }
+        Connection c = getConnection();
+        Statement st = c.createStatement();
+
+        boolean result = st.execute("SHUTDOWN");
+        c.close();
+        return result;
+    }
+
+}
diff --git a/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java b/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java
index 043f1205..b66679ca 100644
--- a/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java
+++ b/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java
@@ -253,7 +253,9 @@ public void buildMessageData(Message msg, InputStream ip, String filename) throw
 		try
 		{
 			//byte[] data = IOUtilOld.getFileBytes(file);
-			String contentType = getParameter(PARAM_MIMETYPE, false);
+			// Allow Content-Type to be overridden at partnership level or as property
+			String contentType = msg.getPartnership().getAttributeOrProperty(Partnership.PA_CONTENT_TYPE, null);
+			if (contentType == null) contentType = getParameter(PARAM_MIMETYPE, false);
 			if (contentType == null)
 			{
 				contentType = "application/octet-stream";
diff --git a/Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java b/Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java
index ccc8f8b1..1a796778 100644
--- a/Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java
+++ b/Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java
@@ -487,11 +487,11 @@ protected void addCustomOuterMimeHeaders(Message msg, MimeBodyPart dataBP) throw
     }
 
 
-	protected InternetHeaders getHttpHeaders(Message msg, MimeBodyPart securedData) {
+	protected InternetHeaders getHttpHeaders(Message msg, MimeBodyPart securedData) throws MessagingException {
 		Partnership partnership = msg.getPartnership();
 		InternetHeaders ih = new InternetHeaders();
 
-		ih.addHeader("Connection", "close, TE");
+		ih.addHeader(HTTPUtil.HEADER_CONNECTION, "close, TE");
 		String userAgent = Properties.getProperty(Properties.HTTP_USER_AGENT_PROP,
 				msg.getAppTitle() + " (" + AS2SenderModule.class.getSimpleName() + ")");
 		ih.addHeader("User-Agent", userAgent);
@@ -503,24 +503,28 @@ protected InternetHeaders getHttpHeaders(Message msg, MimeBodyPart securedData)
 		ih.addHeader("Mime-Version", "1.0"); // make sure this is the
 		// encoding used in the msg, run TBF1
 		try {
-			ih.addHeader("Content-type", securedData.getContentType());
+			ih.addHeader(HTTPUtil.HEADER_CONTENT_TYPE, securedData.getContentType());
 		} catch (MessagingException e) {
-			ih.addHeader("Content-type", msg.getContentType());
+			ih.addHeader(HTTPUtil.HEADER_CONTENT_TYPE, msg.getContentType());
 		}
-		ih.addHeader("AS2-Version", "1.1"); // RFC6017 - AS2 V1.1 supports compression
 		// AS2 V1.2 additionally supports EDIINT-Features
 		// ih.addHeader("EDIINT-Features","CEM,multiple-attachments"); 
 		// TODO (possibly implement???)
-		String cte = null;
-		try {
-			cte = securedData.getEncoding();
-		} catch (MessagingException e1) {
-			e1.printStackTrace();
-		}
-		if (cte == null) {
-			cte = Session.DEFAULT_CONTENT_TRANSFER_ENCODING;
+		ih.addHeader("AS2-Version", "1.1"); // RFC6017 - AS2 V1.1 supports compression
+		/* The Content-Transfer-Encoding header is now a restricted header for HTTP so allow
+		 *  it to be controlled by config at partnership level
+		 *  Java will automatically remove this even if set  unless the
+		 *  sun.net.http.allowRestrictedHeaders property is set to "true"
+		 */
+		if ("true".equalsIgnoreCase(System.getProperty("sun.net.http.allowRestrictedHeaders", "false"))) {
+			if (logger.isDebugEnabled()) logger.debug("HTTP RESTRICTED HEADERS property is not active");
+			String cte = null;
+			cte = msg.getPartnership().getAttributeOrProperty(Partnership.PA_CONTENT_TRANSFER_ENCODING, null);
+			if (cte != null) {
+				if ("true".equalsIgnoreCase(msg.getPartnership().getAttributeOrProperty(Partnership.PA_SET_CONTENT_TRANSFER_ENCODING_HTTP, "false")))
+					ih.addHeader("Content-Transfer-Encoding", cte);			
+			}
 		}
-		ih.addHeader("Content-Transfer-Encoding", cte);
 		ih.addHeader("Recipient-Address", partnership.getAttribute(Partnership.PA_AS2_URL));
 		String rId = partnership.getReceiverID(Partnership.PID_AS2);
 		if (rId.contains(" ")) rId = "\"" + rId + "\"";
@@ -535,7 +539,7 @@ protected InternetHeaders getHttpHeaders(Message msg, MimeBodyPart securedData)
 			ih.addHeader("Disposition-Notification-To", dispTo);
 		}
 		String dispOptions = partnership.getAttribute(Partnership.PA_AS2_MDN_OPTIONS);
-		if (dispOptions != null) {
+		if (dispOptions != null && !"none".equalsIgnoreCase(dispOptions)) {
 			ih.addHeader("Disposition-Notification-Options", dispOptions);
 		}
 		String receiptOption = partnership.getAttribute(Partnership.PA_AS2_RECEIPT_OPTION);
@@ -652,8 +656,12 @@ protected void calcAndStoreMic(Message msg, MimeBodyPart mbp, boolean includeHea
         // Calculate and get the original mic
         // includeHeaders = (msg.getHistory().getItems().size() > 1);
 
-        DispositionOptions dispOptions = new DispositionOptions(msg.getPartnership().getAttribute(
-                Partnership.PA_AS2_MDN_OPTIONS));
+    	String mdnOptions = msg.getPartnership().getAttributeOrProperty(Partnership.PA_AS2_MDN_OPTIONS, null);
+    	if (mdnOptions == null || mdnOptions.length() < 1) {
+    		throw new OpenAS2Exception("Partner attribute " + Partnership.PA_AS2_MDN_OPTIONS + "is required but can be set to \"none\"");
+    	}
+    	if ("none".equalsIgnoreCase(mdnOptions)) return;
+        DispositionOptions dispOptions = new DispositionOptions(mdnOptions);
         msg.setCalculatedMIC(AS2Util.getCryptoHelper().calculateMIC(mbp, dispOptions.getMicalg()
                 , includeHeaders, msg.getPartnership().isPreventCanonicalization()));
         if (logger.isTraceEnabled())
diff --git a/Server/src/main/java/org/openas2/util/AS2Util.java b/Server/src/main/java/org/openas2/util/AS2Util.java
index ca5d2505..5d9a0a6d 100644
--- a/Server/src/main/java/org/openas2/util/AS2Util.java
+++ b/Server/src/main/java/org/openas2/util/AS2Util.java
@@ -204,10 +204,13 @@ public static boolean checkMDN(AS2Message msg) throws DispositionException, Open
 			throw new OpenAS2Exception(e);
 		}
 
+		if ("none".equalsIgnoreCase(msg.getPartnership().getAttribute(Partnership.PA_AS2_MDN_OPTIONS))) {
+			// signed MDN not requested so...
+			return true;
+		}
 		if (logger.isTraceEnabled())
 			logger.trace("MIC processing start... ");
 		// get the returned mic from mdn object
-
 		String returnMIC = msg.getMDN().getAttribute(AS2MessageMDN.MDNA_MIC);
 		if (returnMIC == null || returnMIC.length() < 1) {
 			if (dispositionHasWarning)
diff --git a/Server/src/main/java/org/openas2/util/HTTPUtil.java b/Server/src/main/java/org/openas2/util/HTTPUtil.java
index 71f14adc..5b025e2c 100644
--- a/Server/src/main/java/org/openas2/util/HTTPUtil.java
+++ b/Server/src/main/java/org/openas2/util/HTTPUtil.java
@@ -139,7 +139,8 @@ public static abstract class Method {
 	};
 
 	public static String getHTTPResponseMessage(int responseCode) {
-		return httpResponseCodeToPhrase.getOrDefault((Integer)responseCode, "Unknown");
+		String code = httpResponseCodeToPhrase.get((Integer)responseCode);
+		return (code == null)?"Unknown":code;
 	}
 
 	public static byte[] readHTTP(InputStream inStream, OutputStream outStream, InternetHeaders headerCache,
diff --git a/Server/src/test/resources/SingleServerTest/MyCompany/config/config.xml b/Server/src/test/resources/SingleServerTest/MyCompany/config/config.xml
index b422fbe4..59264564 100644
--- a/Server/src/test/resources/SingleServerTest/MyCompany/config/config.xml
+++ b/Server/src/test/resources/SingleServerTest/MyCompany/config/config.xml
@@ -37,6 +37,20 @@
                pendingMDN="%home%/../data/pendingMDN3"
                pendingMDNinfo="%home%/../data/pendinginfoMDN3">
 
+		<module classname="org.openas2.processor.sender.AS2SenderModule"
+		    retries="0"/>
+
+		<module classname="org.openas2.processor.sender.MDNSenderModule"
+		    retries="0"/>
+
+        <module classname="org.openas2.processor.receiver.AS2DirectoryPollingModule"
+                outboxdir="%home%/../data/toMyCompany/"
+                errordir="%home%/../data/toMyCompany/error"
+                interval="1"
+                defaults="sender.as2_id=PartnerA_OID, receiver.as2_id=MyCompany_OID"
+                sendfilename="true"
+                mimetype="application/EDI-X12"/>
+
         <module classname="org.openas2.processor.receiver.AS2ReceiverModule"
                 port="10080"
                 errordir="%home%/../data/inbox/error"
diff --git a/Server/src/test/resources/SingleServerTest/MyCompany/config/partnerships.xml b/Server/src/test/resources/SingleServerTest/MyCompany/config/partnerships.xml
index 81e95b63..14f795d6 100644
--- a/Server/src/test/resources/SingleServerTest/MyCompany/config/partnerships.xml
+++ b/Server/src/test/resources/SingleServerTest/MyCompany/config/partnerships.xml
@@ -16,7 +16,7 @@
         <attribute name="content_transfer_encoding" value="8bit"/>
         <attribute name="compression_type" value="ZLIB"/>
         <attribute name="subject" value="File $attributes.filename$ sent from $sender.name$ to $receiver.name$"/>
-        <attribute name="as2_url" value="http://localhost:20080"/>
+        <attribute name="as2_url" value="http://localhost:10080"/>
         <attribute name="as2_mdn_to" value="edi@myCompany.org"/>
         <!--  <attribute name="as2_receipt_option" value="http://localhost:10080"/>   ...for async MDN-->
         <attribute name="as2_mdn_options"
@@ -37,7 +37,7 @@
         <attribute name="content_transfer_encoding" value="8bit"/>
         <attribute name="compression_type" value="ZLIB"/>
         <attribute name="subject" value="File $attributes.filename$ sent from $sender.name$ to $receiver.name$"/>
-        <attribute name="as2_url" value="http://localhost:20080"/>
+        <attribute name="as2_url" value="http://localhost:10080"/>
         <attribute name="as2_mdn_to" value="edi@myCompany.org"/>
         <!--  <attribute name="as2_receipt_option" value="http://localhost:10080"/>   ...for async MDN-->
         <attribute name="as2_mdn_options"
diff --git a/changes.txt b/changes.txt
index 1444e571..0af3d4f9 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,12 @@
+Version 2.6.2 - 2018-09-26
+This is a minor enhancement and bgufix:
+       IMPORTANT NOTE: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
+
+  1. Provide ability to use restricted headers in HTTP with partnership level overrides for the "Content-Transfer-Encoding" header
+  2. Allow unsigned MDN to be sent using the "none" keyword for the "as2_mdn_options" attribute
+  3. Use a Java 7 compatible method call for a Map class method that required Java 8
+
+
 Version 2.6.1 - 2018-09-09
 This is a minor enhancement:
        IMPORTANT NOTE: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
diff --git a/docs/OpenAS2HowTo.odt b/docs/OpenAS2HowTo.odt
index 1e2f73e6..eae3663c 100644
Binary files a/docs/OpenAS2HowTo.odt and b/docs/OpenAS2HowTo.odt differ
diff --git a/docs/OpenAS2HowTo.pdf b/docs/OpenAS2HowTo.pdf
index 23c242a6..227f8ac0 100644
Binary files a/docs/OpenAS2HowTo.pdf and b/docs/OpenAS2HowTo.pdf differ
diff --git a/pom.xml b/pom.xml
index 85cf0e4e..ea701892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,312 +1,312 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>net.sf.openas2</groupId>
-	<artifactId>OpenAS2</artifactId>
-	<version>2.6.1</version>
-	<name>OpenAS2</name>
-	<packaging>pom</packaging>
-
-	<description>
-        This is the base Maven build file for the OpenAS2 project.
-        The project comprises a server ,osgi bundle and a remote client component.
-        There is a pom.xml for each of the components to build that component.
-    </description>
-
-	<url>https://sourceforge.net/projects/openas2</url>
-
-	<licenses>
-		<license>
-			<name>BSD-2 License</name>
-			<url>https://opensource.org/licenses/BSD-2-Clause</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-	<modules>
-		<module>Server</module>
-		<module>Remote</module>
-		<module>Bundle</module>
-	</modules>
-
-	<properties>
-		<java.version>1.7</java.version>
-	</properties>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.osgi</groupId>
-				<artifactId>org.osgi.core</artifactId>
-				<version>4.3.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.dom4j</groupId>
-				<artifactId>dom4j</artifactId>
-				<version>2.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.bouncycastle</groupId>
-				<artifactId>bcmail-jdk15on</artifactId>
-				<version>1.59</version>
-			</dependency>
-			<dependency>
-				<groupId>org.bouncycastle</groupId>
-				<artifactId>bcpkix-jdk15on</artifactId>
-				<version>1.59</version>
-			</dependency>
-			<dependency>
-				<groupId>org.bouncycastle</groupId>
-				<artifactId>bcprov-jdk15on</artifactId>
-				<version>1.59</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>3.7</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-cli</groupId>
-				<artifactId>commons-cli</artifactId>
-				<version>1.4</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId>
-				<version>1.2</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.mail</groupId>
-				<artifactId>javax.mail-api</artifactId>
-				<version>1.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.mail</groupId>
-				<artifactId>javax.mail</artifactId>
-				<version>1.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>com.h2database</groupId>
-				<artifactId>h2</artifactId>
-				<version>1.4.197</version>
-			</dependency>
-			<dependency>
-				<groupId>org.bouncycastle</groupId>
-				<artifactId>bcpg-jdk15on</artifactId>
-				<version>1.54</version>
-			</dependency>
-			<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpcore</artifactId>
-				<version>4.4.9</version>
-			</dependency>
-			<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>4.5.5</version>
-			</dependency>
-			<dependency>
-				<groupId>com.google.code.findbugs</groupId>
-				<artifactId>findbugs</artifactId>
-				<version>3.0.1</version>
-				<scope>provided</scope> <!--not used in run-time -->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.hamcrest</groupId>
-				<artifactId>hamcrest-all</artifactId>
-				<version>1.3</version>
-				<scope>test</scope>
-			</dependency>
-			<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
-			<dependency>
-    				<groupId>org.mockito</groupId>
-    				<artifactId>mockito-core</artifactId>
-    				<version>2.18.3</version>
-    				<scope>test</scope>
-			</dependency>
-			
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>2.6</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<repository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
-
-	<scm>
-		<url>git@github.com:OpenAS2/OpenAs2App.git</url>
-		<connection>scm:git:git@github.com:OpenAS2/OpenAs2App.git</connection>
-		<developerConnection>scm:git:git@github.com:OpenAS2/OpenAs2App.git</developerConnection>
-		<tag>HEAD</tag>
-	</scm>
-
-	<developers>
-		<developer>
-			<id>uhurusurfa</id>
-			<name>Christopher Broderick</name>
-			<email>uhurusurfa@users.sf.net</email>
-		</developer>
-	</developers>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.6.1</version>
-					<configuration>
-						<source>${java.version}</source>
-						<target>${java.version}</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.2</version>
-					<configuration>
-						<archive>
-							<index>true</index>
-							<manifest>
-								<addClasspath>true</addClasspath>
-								<mainClass>${mainClass}</mainClass>
-								<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-							</manifest>
-						</archive>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.0.0</version>
-					<executions>
-						<execution>
-							<id>copy-dependencies</id>
-							<phase>package</phase>
-							<goals>
-								<goal>copy-dependencies</goal>
-							</goals>
-							<configuration>
-								<outputDirectory>${project.build.directory}/dist/lib</outputDirectory>
-								<overWriteReleases>false</overWriteReleases>
-								<overWriteSnapshots>false</overWriteSnapshots>
-								<overWriteIfNewer>true</overWriteIfNewer>
-								<includeScope>runtime</includeScope>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.8</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.wagon</groupId>
-							<artifactId>wagon-ssh</artifactId>
-							<version>2.12</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.3</version>
-					<configuration>
-						<useReleaseProfile>false</useReleaseProfile>
-						<releaseProfiles>release</releaseProfiles>
-						<goals>deploy</goals>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.sonatype.plugins</groupId>
-					<artifactId>nexus-staging-maven-plugin</artifactId>
-					<version>1.6.7</version>
-					<extensions>true</extensions>
-					<configuration>
-						<serverId>ossrh</serverId>
-						<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-						<autoReleaseAfterClose>true</autoReleaseAfterClose>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-	<profiles>
-		<profile>
-			<id>release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-						<version>3.0.1</version>
-						<executions>
-							<execution>
-								<id>attach-sources</id>
-								<goals>
-									<goal>jar-no-fork</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.10.4</version>
-						<executions>
-							<execution>
-								<id>attach-javadocs</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>net.sf.openas2</groupId>
+	<artifactId>OpenAS2</artifactId>
+	<version>2.6.2</version>
+	<name>OpenAS2</name>
+	<packaging>pom</packaging>
+
+	<description>
+        This is the base Maven build file for the OpenAS2 project.
+        The project comprises a server ,osgi bundle and a remote client component.
+        There is a pom.xml for each of the components to build that component.
+    </description>
+
+	<url>https://sourceforge.net/projects/openas2</url>
+
+	<licenses>
+		<license>
+			<name>BSD-2 License</name>
+			<url>https://opensource.org/licenses/BSD-2-Clause</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<modules>
+		<module>Server</module>
+		<module>Remote</module>
+		<module>Bundle</module>
+	</modules>
+
+	<properties>
+		<java.version>1.7</java.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.osgi</groupId>
+				<artifactId>org.osgi.core</artifactId>
+				<version>4.3.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.dom4j</groupId>
+				<artifactId>dom4j</artifactId>
+				<version>2.0.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.bouncycastle</groupId>
+				<artifactId>bcmail-jdk15on</artifactId>
+				<version>1.59</version>
+			</dependency>
+			<dependency>
+				<groupId>org.bouncycastle</groupId>
+				<artifactId>bcpkix-jdk15on</artifactId>
+				<version>1.59</version>
+			</dependency>
+			<dependency>
+				<groupId>org.bouncycastle</groupId>
+				<artifactId>bcprov-jdk15on</artifactId>
+				<version>1.59</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-lang3</artifactId>
+				<version>3.7</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>1.4</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-logging</groupId>
+				<artifactId>commons-logging</artifactId>
+				<version>1.2</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.mail</groupId>
+				<artifactId>javax.mail-api</artifactId>
+				<version>1.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.mail</groupId>
+				<artifactId>javax.mail</artifactId>
+				<version>1.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>com.h2database</groupId>
+				<artifactId>h2</artifactId>
+				<version>1.4.197</version>
+			</dependency>
+			<dependency>
+				<groupId>org.bouncycastle</groupId>
+				<artifactId>bcpg-jdk15on</artifactId>
+				<version>1.54</version>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpcore</artifactId>
+				<version>4.4.9</version>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>4.5.5</version>
+			</dependency>
+			<dependency>
+				<groupId>com.google.code.findbugs</groupId>
+				<artifactId>findbugs</artifactId>
+				<version>3.0.1</version>
+				<scope>provided</scope> <!--not used in run-time -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.hamcrest</groupId>
+				<artifactId>hamcrest-all</artifactId>
+				<version>1.3</version>
+				<scope>test</scope>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
+			<dependency>
+    				<groupId>org.mockito</groupId>
+    				<artifactId>mockito-core</artifactId>
+    				<version>2.18.3</version>
+    				<scope>test</scope>
+			</dependency>
+			
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>2.6</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<distributionManagement>
+		<snapshotRepository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+		<repository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+	</distributionManagement>
+
+	<scm>
+		<url>git@github.com:OpenAS2/OpenAs2App.git</url>
+		<connection>scm:git:git@github.com:OpenAS2/OpenAs2App.git</connection>
+		<developerConnection>scm:git:git@github.com:OpenAS2/OpenAs2App.git</developerConnection>
+		<tag>HEAD</tag>
+	</scm>
+
+	<developers>
+		<developer>
+			<id>uhurusurfa</id>
+			<name>Christopher Broderick</name>
+			<email>uhurusurfa@users.sf.net</email>
+		</developer>
+	</developers>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.6.1</version>
+					<configuration>
+						<source>${java.version}</source>
+						<target>${java.version}</target>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.0.2</version>
+					<configuration>
+						<archive>
+							<index>true</index>
+							<manifest>
+								<addClasspath>true</addClasspath>
+								<mainClass>${mainClass}</mainClass>
+								<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							</manifest>
+						</archive>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>3.0.0</version>
+					<executions>
+						<execution>
+							<id>copy-dependencies</id>
+							<phase>package</phase>
+							<goals>
+								<goal>copy-dependencies</goal>
+							</goals>
+							<configuration>
+								<outputDirectory>${project.build.directory}/dist/lib</outputDirectory>
+								<overWriteReleases>false</overWriteReleases>
+								<overWriteSnapshots>false</overWriteSnapshots>
+								<overWriteIfNewer>true</overWriteIfNewer>
+								<includeScope>runtime</includeScope>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.8</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-ssh</artifactId>
+							<version>2.12</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.5.3</version>
+					<configuration>
+						<useReleaseProfile>false</useReleaseProfile>
+						<releaseProfiles>release</releaseProfiles>
+						<goals>deploy</goals>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<version>1.6.7</version>
+					<extensions>true</extensions>
+					<configuration>
+						<serverId>ossrh</serverId>
+						<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+						<autoReleaseAfterClose>true</autoReleaseAfterClose>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+	<profiles>
+		<profile>
+			<id>release</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>3.0.1</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar-no-fork</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.10.4</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+</project>