SSDM-9369 Added results merging, so that multiple matches have higher rank and the matches and their spans in the same row are merged.

SSDM-9369 Added results merging, so that multiple matches have higher rank and the matches and their spans in the same row are merged.

SSDM-9369 Added results merging, so that multiple matches have higher rank and the matches and their spans in the same row are merged.

SSDM-9845 Made the test GeneralInformationServiceTest.testSearchForSamplesByPermIdByAnyField() pass.

SSDM-9845 Made the test GeneralInformationServiceTest.testSearchForMaterialsByAnyFieldMatchingAttribute() pass.

SSDM-9845 Made the test GeneralInformationServiceTest.testSearchForSamplesByAnyFieldWithSubCriteria() pass.

SSDM-9845 Added test SearchDataSetTest.testSearchWithContainer() and renamed the old one with the same name.

SSDM-9845 Added test SearchSampleTest.testSearchWithContainer() and renamed the old one with the same name.

SSDM-9845 Added test SearchSampleTest.testSearchWithChildren(). Made distinction between container and parent-child relationships.

This reverts commit 071c4448.

SSDM-9369 Created a test in GlobalSearchTest to emulate behavior of a failing test in test-search.js. Some extra fixes in GlobalSearchObjectFetchOptions.js. Fixed failing test-search.js, but one line had to be commented out.

SSDM-9369 Created a test in GlobalSearchTest to emulate behavior of a failing test in test-search.js. Some extra fixes in GlobalSearchObjectFetchOptions.js.