Add SPR-12118
Add SPR-12165
Revert "Add SPR-12165"

This reverts commit 45157f3674217d9d6900f89b6706d5f198d88cbc.
Add SPR-12165
Add tests to illustrate problem described in SPR-12194
Merge pull request #85 from wilkinsona/SPR-12194

Add tests to illustrate problem described in SPR-12194
Update SPR-11660 for Spring Framework 4.1.0.RELEASE