Re-apply PATCH-4 to v6.0

[PaulBoon]

IQSS#9984 and IQSS#9955

[coveralls]

Pull Request Test Coverage Report for Build #28

• 1 of 24 (4.17%) changed or added relevant lines in 5 files are covered.
• 9 unchanged lines in 4 files lost coverage.
• Overall coverage decreased (-0.01%) to 19.958%

---

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
src/main/java/edu/harvard/iq/dataverse/util/SignpostingResources.java	0	2	0.0%
src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java	0	3	0.0%
src/main/java/edu/harvard/iq/dataverse/DatasetPage.java	0	6	0.0%
src/main/java/edu/harvard/iq/dataverse/api/Datasets.java	0	12	0.0%

Files with Coverage Reduction	New Missed Lines	%
src/main/java/edu/harvard/iq/dataverse/api/Datasets.java	1	0.23%
src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java	1	1.33%
src/main/java/edu/harvard/iq/dataverse/DatasetPage.java	1	0.0%
src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java	6	14.81%

Totals
Change from base Build #26:	-0.01%
Covered Lines:	16086
Relevant Lines:	80601

---

💛 - Coveralls