Merge branch '3_x-dev-cta' into 3_x-dev-next

Conflicts:
	dspace/config/dspace.cfg
	dspace/config/input-forms.xml
Merge branch '3_x-dev-thumbnails' into 3_x-dev-next