getting shared object UI working again for this server.
Merge branch 'geocat_searchui_develop' of github.com:camptocamp/geocat into shared_object_ui
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
shared objects UI is working again.
Merge branch 'geocat_searchui_develop' of github.com:camptocamp/geocat into shared_object_ui
Merge branch 'formatter-functions' of github.com:jesseeichar/core-geonetwork into shared_object_ui
Fix for format when some elements are null.
Merge branch 'formatter-functions' of github.com:jesseeichar/core-geonetwork into shared_object_ui
remove id column in shared objects because it doesn't make much sense with subtemplates
Merge branch 'formatter-functions' of github.com:jesseeichar/core-geonetwork into shared_object_ui
Merge branch 'formatter-functions' of github.com:jesseeichar/core-geonetwork into shared_object_ui
More fixes for shared objects
Fixed Reject at long last
Added test that surfaces another bug in the shared objects
Some more fixes.  basic functionality seems to be working
Removed obsolete Format in domain
Merge branch 'formatter-functions' of github.com:jesseeichar/core-geonetwork into shared_object_ui

Conflicts:
	web/src/main/java/org/fao/geonet/Geonetwork.java
A bunch of work on migration scripts
several fixes for migration
Merge branch 'develop' of github.com:geonetwork/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
	harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java
	services/src/main/java/org/fao/geonet/services/user/List.java
	web-ui/src/main/resources/catalog/lib/ol-whitespace.js
	web/src/main/java/org/fao/geonet/Geonetwork.java
	web/src/main/webResources/WEB-INF/config-spring-env.xml
	web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/2-migrate-default.sql
	web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/MoveHarvesterSettings.java
	web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v280/MoveHarvesterSettingsToHigherNumber.java
	web/src/main/webapp/xslt/base-layout-cssjs-loader.xsl