testdata-spring: add mvc:annotation-driven where needed (doesn't affect us, but should be in real web-app)
Merge remote-tracking branch 'base/master'