Upgrade to Spring mvc 4 @RestController annotation