backport commits 1377657, 1377659, and 1484315
 and fix test and spring version number (RC2 -> RELEASE).


git-svn-id: https://svn.apache.org/repos/asf/tiles/request/branches/TREQ_1_0_X@1484502 13f79535-47bb-0310-9956-ffa450edef68