Restore method signature in ViewControllerRegistration

Issue: SPR-12016
Fix issue with @EnableWebMvc + existing ViewResolver

Issue: SPR-12013
Polish