diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
index 1d3ba17d966..8b8c113ae70 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.scripting.bsh;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -47,7 +48,7 @@ import static org.mockito.BDDMockito.*;
 public class BshScriptFactoryTests {
 
 	@Test
-	public void staticScript() throws Exception {
+	public void staticScript() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
 
 		assertTrue(Arrays.asList(ctx.getBeanNamesForType(Calculator.class)).contains("calculator"));
@@ -75,7 +76,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void staticScriptWithNullReturnValue() throws Exception {
+	public void staticScriptWithNullReturnValue() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
 		assertTrue(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerWithConfig"));
 
@@ -86,7 +87,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void staticScriptWithTwoInterfacesSpecified() throws Exception {
+	public void staticScriptWithTwoInterfacesSpecified() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
 		assertTrue(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerWithConfigExtra"));
 
@@ -100,7 +101,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void staticWithScriptReturningInstance() throws Exception {
+	public void staticWithScriptReturningInstance() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
 		assertTrue(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstance"));
 
@@ -114,7 +115,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void staticScriptImplementingInterface() throws Exception {
+	public void staticScriptImplementingInterface() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
 		assertTrue(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerImpl"));
 
@@ -128,7 +129,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void staticPrototypeScript() throws Exception {
+	public void staticPrototypeScript() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
 		ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
@@ -147,7 +148,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void nonStaticScript() throws Exception {
+	public void nonStaticScript() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bshRefreshableContext.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
 
@@ -165,7 +166,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void nonStaticPrototypeScript() throws Exception {
+	public void nonStaticPrototypeScript() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bshRefreshableContext.xml", getClass());
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
 		ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
@@ -189,7 +190,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void scriptCompilationException() throws Exception {
+	public void scriptCompilationException() {
 		try {
 			new ClassPathXmlApplicationContext("org/springframework/scripting/bsh/bshBrokenContext.xml");
 			fail("Must throw exception for broken script file");
@@ -200,7 +201,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void scriptThatCompilesButIsJustPlainBad() throws Exception {
+	public void scriptThatCompilesButIsJustPlainBad() throws IOException {
 		ScriptSource script = mock(ScriptSource.class);
 		final String badScript = "String getMessage() { throw new IllegalArgumentException(); }";
 		given(script.getScriptAsString()).willReturn(badScript);
@@ -217,7 +218,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void ctorWithNullScriptSourceLocator() throws Exception {
+	public void ctorWithNullScriptSourceLocator() {
 		try {
 			new BshScriptFactory(null, Messenger.class);
 			fail("Must have thrown exception by this point.");
@@ -227,9 +228,9 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void ctorWithEmptyScriptSourceLocator() throws Exception {
+	public void ctorWithEmptyScriptSourceLocator() {
 		try {
-			new BshScriptFactory("", new Class<?>[] {Messenger.class});
+			new BshScriptFactory("", Messenger.class);
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -237,9 +238,9 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void ctorWithWhitespacedScriptSourceLocator() throws Exception {
+	public void ctorWithWhitespacedScriptSourceLocator() {
 		try {
-			new BshScriptFactory("\n   ", new Class<?>[] {Messenger.class});
+			new BshScriptFactory("\n   ", Messenger.class);
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -247,7 +248,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void resourceScriptFromTag() throws Exception {
+	public void resourceScriptFromTag() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bsh-with-xsd.xml", getClass());
 		TestBean testBean = (TestBean) ctx.getBean("testBean");
 
@@ -286,7 +287,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void prototypeScriptFromTag() throws Exception {
+	public void prototypeScriptFromTag() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bsh-with-xsd.xml", getClass());
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
 		ConfigurableMessenger messenger2 = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
@@ -302,7 +303,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void inlineScriptFromTag() throws Exception {
+	public void inlineScriptFromTag() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bsh-with-xsd.xml", getClass());
 		Calculator calculator = (Calculator) ctx.getBean("calculator");
 		assertNotNull(calculator);
@@ -310,7 +311,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void refreshableFromTag() throws Exception {
+	public void refreshableFromTag() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bsh-with-xsd.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
 		assertEquals("Hello World!", messenger.getMessage());
@@ -318,7 +319,7 @@ public class BshScriptFactoryTests {
 	}
 
 	@Test
-	public void applicationEventListener() throws Exception {
+	public void applicationEventListener() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("bsh-with-xsd.xml", getClass());
 		Messenger eventListener = (Messenger) ctx.getBean("eventListener");
 		ctx.publishEvent(new MyEvent(ctx));
diff --git a/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml
index dac8e828d4c..e1ce67e164b 100644
--- a/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml
+++ b/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:lang="http://www.springframework.org/schema/lang"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 				http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
 
 	<lang:bsh id="messenger" script-source="classpath:org/springframework/scripting/bsh/Messenger.bsh"
@@ -52,12 +51,12 @@
 		<lang:property name="message" value="Hello World!"/>
 	</lang:bsh>
 
-<lang:bsh id="eventListener" script-interfaces="org.springframework.context.ApplicationListener,org.springframework.scripting.Messenger" >
-<lang:inline-script><![CDATA[
-int count;
-void onApplicationEvent (org.springframework.context.ApplicationEvent event) { count++; System.out.println(event); }
-String getMessage() { return "count=" + count; }
-]]></lang:inline-script>
-</lang:bsh>
+    <lang:bsh id="eventListener" script-interfaces="org.springframework.context.ApplicationListener,org.springframework.scripting.Messenger" >
+        <lang:inline-script><![CDATA[
+            int count;
+            void onApplicationEvent (org.springframework.context.ApplicationEvent event) { count++; System.out.println(event); }
+            String getMessage() { return "count=" + count; }
+        ]]></lang:inline-script>
+    </lang:bsh>
 
 </beans>
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index 5b09fb3ba88..200819ee78a 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -108,9 +108,10 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 		this.supportedMediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
 		this.supportedMediaTypes.add(MediaType.MULTIPART_FORM_DATA);
 
-		this.partConverters.add(new ByteArrayHttpMessageConverter());
 		StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter();
-		stringHttpMessageConverter.setWriteAcceptCharset(false);
+		stringHttpMessageConverter.setWriteAcceptCharset(false);  // see SPR-7316
+
+		this.partConverters.add(new ByteArrayHttpMessageConverter());
 		this.partConverters.add(stringHttpMessageConverter);
 		this.partConverters.add(new ResourceHttpMessageConverter());
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
index 2f3e73f07c3..7d68850edfc 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
@@ -37,7 +37,8 @@ import org.springframework.util.ClassUtils;
 public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConverter {
 
 	private static final boolean jaxb2Present =
-			ClassUtils.isPresent("javax.xml.bind.Binder", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
+			ClassUtils.isPresent("javax.xml.bind.Binder",
+					AllEncompassingFormHttpMessageConverter.class.getClassLoader());
 
 	private static final boolean jackson2Present =
 			ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper",
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
index aab1cd03e47..1cba95bde18 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -786,11 +786,11 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
 	 * @param messageConverters the list to add the default message converters to
 	 */
 	protected final void addDefaultHttpMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
-		StringHttpMessageConverter stringConverter = new StringHttpMessageConverter();
-		stringConverter.setWriteAcceptCharset(false);
+		StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter();
+		stringHttpMessageConverter.setWriteAcceptCharset(false);  // see SPR-7316
 
 		messageConverters.add(new ByteArrayHttpMessageConverter());
-		messageConverters.add(stringConverter);
+		messageConverters.add(stringHttpMessageConverter);
 		messageConverters.add(new ResourceHttpMessageConverter());
 		messageConverters.add(new ResourceRegionHttpMessageConverter());
 		messageConverters.add(new SourceHttpMessageConverter<>());