Merge branch 'develop' of github.com:jesseeichar/core-geonetwork into formatter-functions

Conflicts:
	core/src/test/java/org/fao/geonet/AbstractCoreIntegrationTest.java
	core/src/test/resources/core-repository-test-context.xml
	services/src/main/java/org/fao/geonet/services/user/List.java
	web/src/test/resources/migration-repository-test-context.xml
Improve migration error logging
Replace timers with single ScheduledServiceExecutor.

Timers were a thread leak in Metadata Notifier because each notification started a new timer but timers never have their thread shutdown.

Also was a problem for tests because timers kept getting created until (occasionally) a perm gen error occurred
Merge branch 'develop' into formatter-functions
Fixed null pointer exception
Fixed bug with template cache resolving parent folders
Merge branch 'formatter-functions' of github.com:jesseeichar/core-geonetwork into shared_object_ui

Conflicts:
	core/src/test/java/org/fao/geonet/AbstractCoreIntegrationTest.java
	core/src/test/resources/core-repository-test-context.xml