HSEARCH-1437 for master

https://hibernate.atlassian.net/browse/HSEARCH-1437

Similar to PR #542 But also fixing dependencies in the performance module