Re-upgraded Spring to version 3.1.4.

This reverts commit 080e9159c0431abf53f3683ca24b668e9bcffb69.
Merge branch 'master'.
Fixed strings for distributed status page. Removed setHeader() call that causes problems in Spring 3.1.