Editor / Keyword picker / Do not display thesaurus selector if the directive is configured with a thesaurus - only autocompletion for the thesaurus. This is useful to create a field which is not a keyword and needs to be populated from a specific thesaurus.
Editor / Directory entry / Add support for different types of subtemplates and more flexible configuration.
Merge pull request #660 from fxprunayre/improvement/editor/subtemplate-directive-cfg

Editor / Directory entry / Add support for different types of subtemplates and more flexible configuration
Merge remote-tracking branch 'origin/stable-develop' into develop

Conflicts:
	schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml
	web-ui/src/main/resources/catalog/components/edit/directoryentryselector/DirectoryEntrySelector.js
	web-ui/src/main/resources/catalog/locales/en-editor.json
	web-ui/src/main/resources/catalog/locales/fr-editor.json
Editor / Subtemplate / Support keyword for any profiles (including ISO19115-3). Add ISO19115-3 namespace required for other types of subtemplate.
Fix JSON file.
Update to OL3.0.0. Fix #662

Other minor improvements:
* Display geopublisher action only if mapservers configured
* Thumbnail generation:
 * report error (grabbed from HTML error page)
 * zoom to layer extent
 * reload properly online source and extent changes
 * add loading indicator while generating thumbnail
Harvester / GeoNetwork / Failed to harvest record in iso19139 profile if schema is not available #663.
Merge remote-tracking branch 'origin/stable-develop' into develop

Conflicts:
	harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java
	web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
Fix wrong merge.
Some thesaurus store title in dcterm:title (eg. SeaDataNet P01, p03).
Improve keyword and thesaurus selection.

* Add configuration of thesaurus by view (set max number of keywords and transformation)
* Hide transformation list if only one defined (keep editor simple)
* Define list of thesaurus allowed.
Editor / Keyword / Fix layout with long keywords #665.
Merge remote-tracking branch 'origin/stable-develop' into develop

Conflicts:
	schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml
	web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js
	web-ui/src/main/resources/catalog/locales/en-editor.json
	web-ui/src/main/resources/catalog/locales/fr-editor.json
Merge remote-tracking branch 'origin/stable-develop' into develop
Changed how version numbers are compared in database migration and ensured tests pass
Merge branch 'develop' of github.com:jesseeichar/core-geonetwork into develop
Pass connection to Database migration tasks instead of a single statement.
Provide a more robust migration of harvester settings to harvester settings table.
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