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