Issue: SPR-10291

Issue: SPR-10326

In Spring 3.2 a fix was implemented for all Spring Freemarker form
macros so that generated form input fields have valid bracketless IDs.
In the fix a regression was introduced manifesting in formCheckbox
macro no longer generating appropriate names for checkbox and hidden
input field.

This change fixes mentioned regression issue.

Issue: SPR-8732

Changed upper bound of generic parameter for DefaultMockMvcBuilder from
MockMvcBuilder to DefaultMockMvcBuilder to allow for ongoing method
chaining in the fluent API style.

Issue: SPR-10277

Issue: SPR-10308

Issue: SPR-10180

Before this fix AntPathMatcher had a special rule for combining
patterns with wildcards and extensions as follows:

"/*.*"  + "/*.html" => "/*.html"

This change ensures this rule never applies if the first pattern
contains URI variables.

Issue: SPR-10062

Issue: SPR-10339

Issue: SPR-10339

# By Jakub Narloch
* SPR-8509:
  Add Castor XSD information to reference docs

Update the Spring OXM reference documentation to include changes
introduced in CastorMarshaller, specifically around CastorMarshaller
XSD configuration.

Issue: SPR-8509

Refactor FrameworkServlet.doOptions() to capture the "Allow" header
by using a HttpServletResponseWrapper.

Prior to this commit the HttpServletResponse.getHeader() method was
used which is only available in Servlet 3.0 environments.

Issue: SPR-10341

Issue: SPR-10335

Also mentioning JDBC 4's unwrap method for obtaining the native connection now.

Issue: SPR-10312

GroovyScriptFactoryTests passes again now.

Issue: SPR-10304

# By Carson McDonald
* fix-typos-3:
  Fix minor javadoc typos

# By Tomasz Nurkiewicz
* patch-1:
  Fix incorrect closing <web-app> tag in MVC docs

Issue: SPR-10210

Now invoking JdbcTemplate's queryForObject() method instead
of the deprecated queryForInt() method within the test suite.

Issue: SPR-10257

Issue: SPR-10208

JdbcTestUtils now invokes JdbcTemplate's queryForObject() method instead
of the deprecated queryForInt() method.

Issue: SPR-10257

Issue: SPR-10333

JdbcTestUtils now invokes JdbcTemplate's queryForObject() method instead
of the deprecated queryForInt() method.

Issue: SPR-10257

Inner beans are not prototype beans as, in contrast to what is
documented in the section for prototype beans, the inner bean does
get destruction callbacks applied.

Issue: SPR-10311

Previously we had restored the whitespace for *.aj files in 6888a6f2
to avoid a but in aspectj.

We have updated to the latest version of apsectj and restored the
changes in commit 6888a6f2 which included a significant cleanup of
whitespace.

Issue: SPR-10208

Issue: SPR-10282

Issue: SPR-10301

Issue: SPR-10323