discovery.xml: Use CipSubject instead of CIP in searchFilters

I guess it's better to stick to the existing camel case Java conve-
ntion that Atmire started.

Signed-off-by: Alan Orth <a.orth@cgiar.org>
discovery.xml: Switch ICARDA to IcardaSubject in search filters

Better to keep consistency with Java camel case convention which
was already started by Atmire in the other filters.

Signed-off-by: Alan Orth <a.orth@cgiar.org>
Merge branch '4_x-dev-cip' into 4_x-dev-next

Signed-off-by: Alan Orth <a.orth@cgiar.org>

Conflicts:
	dspace/config/dspace.cfg
	dspace/config/spring/api/discovery.xml
	dspace/modules/xmlui/src/main/webapp/i18n/messages.xml
Merge branch '4_x-dev-drylands' into 4_x-dev-next

Signed-off-by: Alan Orth <a.orth@cgiar.org>

Conflicts:
	dspace/config/dspace.cfg
	dspace/config/spring/api/discovery.xml
	dspace/modules/xmlui/src/main/webapp/i18n/messages.xml