a little fix for labels.xml indexing
removed old services that have been changed to mvc services
removed old services that have been changed to mvc services

fixed logging,  not all logs were being written
Merge branch 'formatter-functions' of github.com:jesseeichar/core-geonetwork into shared_object_ui

Conflicts:
	web/src/main/webapp/WEB-INF/classes/log4j.xml
	web/src/main/webapp/WEB-INF/config.xml
	web/src/main/webapp/WEB-INF/config/config-service-admin-user-and-group.xml