Revert previous impl for SPR-10163

This reverts commit 96b418cc8ae537e985cfe67b80cd866d03c8060f,
"Make RequestMappingHandlerMapping xml config easier".

This implementation makes the mvc:annotation namespace less readable,
and future configuration items would add even more to this namespace.

Issue: SPR-10163