mvc:annotation-driven
(cherry picked from commit 56b47c4)
move resources tag
(cherry picked from commit 064ca96)