Fix of REST API, simplification of Spring MVC xml configs