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