Issue: SPR-14444

(cherry picked from commit afe106e2)

(cherry picked from commit 69dd40ec)

Issue: SPR-10343
(cherry picked from commit 9e934038)

Issue: SPR-14468
(cherry picked from commit 4ea5f070)

Issue: SPR-14462
(cherry picked from commit da59b4da)

Issue: SPR-14465
(cherry picked from commit 0065a160)

Issue: SPR-14457
(cherry picked from commit 52f46c7f)

Issue: SPR-14452
(cherry picked from commit f0a826ec)

This commit also aligns ResourceUrlProvider's and RequestMappingInfo's UrlPathHelper setter/getter signatures.

Issue: SPR-14454
(cherry picked from commit 5c3c0f73)

(cherry picked from commit be0b71ce)

Issue: SPR-14427
(cherry picked from commit a1b58ee6)

(cherry picked from commit e3042905)

(cherry picked from commit 92d78c10)

Issue: SPR-14433
(cherry picked from commit 52065a73)

Issue: SPR-14177

(cherry picked from commit e5122d08)

(cherry picked from commit e7a53e37)

Issue: SPR-14423
(cherry picked from commit cfc560c4)

Closes gh-1097
(cherry picked from commit 037746da)

Issue: SPR-14420
(cherry picked from commit 66ec1c16)

(cherry picked from commit 232cfe5e)

The `CacheResolver` and `ErrorHandler` features introduced in 4.1 were
not properly enabled in AspectJ mode. This commit adds more tests from
the regular proxy-based mode and align the AspectJ caching configuration.

Issue: SPR-14413
(cherry picked from commit 6cd85ddd)

Issue: SPR-14394
(cherry picked from commit f5282bc1)

Issue: SPR-14388
(cherry picked from commit fd9d518c)

Issue: SPR-14399
(cherry picked from commit 4102c627)

Issue: SPR-14385

Even before this change SockJS sessions always cancelled the heartbeat
task first prior to sending messages. However when the heartbeat task
is already in progress, cancellation of it is not enough and we must
wait until the heartbeat is sent.

This commit adds a heartbeat write lock which is obtained and held
during the sending of a heartbeat. Now when sessions send a message
they still cancel the heartbeat task but if that fails they also wait
for the heartbeat write lock.

Issue: SPR-14356

Issue: SPR-14349
(cherry picked from commit ca12e13e)