CMS-3625 Refactor elasticsearchDao to return our SearchResult

Commented out since the unchanged-check had to be removed temporary