(cherry picked from commit 028a6901)

(cherry picked from commit ca19920d)

Issue: SPR-13977
(cherry picked from commit a68b910b)

(cherry picked from commit 1899fb37)

Issue: SPR-13967
(cherry picked from commit b9fe6d89)

Latest dependency updates (EhCache 3.0 M5, Groovy 2.4.6, Gson 2.6.1, Hibernate ORM 5.0.8, Hibernate Validator 5.2.4, SLF4J 1.7.16, SnakeYAML 1.17, Undertow 1.3.18)

Issue: SPR-13959
(cherry picked from commit 92353459)

Issue: SPR-13957
(cherry picked from commit 7fcb277d)

Issue: SPR-13951
(cherry picked from commit ac44f9ed)

Issue: SPR-11787
(cherry picked from commit 1253b451)

Issue: SPR-13887
(cherry picked from commit 5ed90468)

This commit introduces a conditional call in
AbstractJackson2HttpMessageConverter#getJavaType() in order to avoid
calling TypeFactory#constructType() with a null contextClass parameter,
since this is not supported by Jackson 2.7 anymore.

It allows to use Spring Framework 4.2.x with Jackson 2.7.1+ for most use
cases, but with some limitations. For example, with Jackson 2.7
TypeVariable resolution from method parameters does not work.

As a consequence, after this commit Spring Framework 4.2.x still fully
supports Jackson up to version 2.6, but improves Jackson 2.7 compatibility.
Full support for Jackson 2.7 is provided as of Spring Framework 4.3.x.

Issue: SPR-13853

Issue: SPR-13935
(cherry picked from commit f61b9984)

Issue: SPR-13918
(cherry picked from commit 43bcab9c)

Issue: SPR-13922
(cherry picked from commit 903ae483)

Issue: SPR-13923
(cherry picked from commit 449f7046)

Latest dependency updates (Hibernate Validator 5.2.3, Joda-Time 2.9.2, OkHttp 2.7.4, SLF4J 1.7.15, Netty 4.0.34, Tomcat 8.0.32, Undertow 1.3.17)

Issue: SPR-13932

Issue: SPR-13917

Before this commit the concurrent session wrapper mainly protected the
sending of messages. The close itself however may also cause a message
to be sent as is the case of the SockJS protocol.

This change protects the close and checks if the session has exceeded
send time or buffer limits in which case the close status is changed
to SESSION_NOT_RELIABLE (introduced in commit cbd5af3a) which in turn
signals that extra care should be exercised when closing the session.

Issue: SPR-13904

Issue: SPR-13906

(cherry picked from commit e9031061)

Issue: SPR-13910
(cherry picked from commit 28e8af2e)

Prior to this commit, a @Transactional integration test would silently
be executed without a transaction if the transaction manager could not
be retrieved from the application context -- for example, it no such
bean was defined or if multiple beans were present but none satisfied
the qualifier.

This commit addresses this issue by throwing an IllegalStateException
if the PlatformTransactionManager cannot be retrieved for a
@Transactional test.

Issue: SPR-13895
(cherry picked from commit 6d2b9a01)

Latest dependency updates (AspectJ 1.8.8, Hibernate ORM 5.0.7, Jackson 2.6.5, Jetty 9.3.7, Undertow 1.3.14, SLF4J 1.7.14)

RequestParamMethodArgumentResolver defensively handles MethodParameter nesting level and java.util.Optional access

Issue: SPR-13850

Issue: SPR-13879

Issue: SPR-13844
(cherry picked from commit 837cb752)

Issue: SPR-13845
(cherry picked from commit ebad8db8)

Issue: SPR-13871
(cherry picked from commit cdc9bf76)

Issue: SPR-13838
(cherry picked from commit 50829c9f)

Issue: SPR-13852
(cherry picked from commit e14c2de1)

Issue: SPR-13858
(cherry picked from commit 5d4547d3)

Prior to this change, configuring a `FixedVersionStrategy` like so
would configure a single "/js/**" path pattern:

```
versionResourceResolver.addFixedVersionStrategy("v1.0.0","/js/**");
```

This commit makes sure that for each path pattern, its prefixed version
is added to the map. For example, the previous configuration also
adds "/v1.0.0/js/**".

Issue: SPR-13883
cherry-picked from 84fe46cd

Prior to this change, the `RequestMappingHandlerAdapter` would first add
a "Cache-Control" HTTP header to the response (depending on its
`WebContentGenerator` configuration and `@SessionAttributes` on the
handler class); then, the Adapter would delegate the actual handler the
processing of the request.
This leads to issues, as the handler does not have full control to the
response and has to deal with pre-existing headers in the response. This
means that the Adapter and the handler can add incompatible
Cache-Control directives without knowing it, since one cannot see the
headers added by the other until the response is committed.

This commit switches the order of execution: first, the handler is
called (possibly adding HTTP headers), then the RMHA processes the
response and adds "Cache-Control" directives *only if there's no
Cache-Control header already defined*.

Issue: SPR-13867
cherry-picked from 8f1d06f1

Prior to this change, the `ResourceUrlEncodingFilter` would try to
lookup resources URLs as soon as the given URL would be longer than the
expected context+servlet prefix path. This can lead to
OutOfBoundsExceptions when the provided URL does not start with that
prefix and still has the required length.

This commit makes sure that all candidate URLs for resources lookup are
prefixed with the cached servlet and context path. This underlines the
fact that the `ResourceUrlEncodingFilter` does not support relative URLs
for now and delegates to the native servlet implementation in that case.

Issue: SPR-13861
cherry-picked from 2f6d86b7