SSDM-9845 Commented out GeneralInformationServiceTest.testSearchForDataSetsByAnyFieldMatchingAttribute().

SSDM-9369 Small fix to HibernateSearchDAOV3Adaptor to prevent it from throwing class cast exception.

SSDM-9369 Added escaping of "'" with "''" when StringContainsExactlyValue criterion is used. Otherwise using "'" would lead to an exception.

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.