Hsearch 1603

This fixes the various "project import" complexities, and makes sure all modules compile and stay so.

 - https://hibernate.atlassian.net/browse/HSEARCH-1603
 - https://hibernate.atlassian.net/browse/HSEARCH-1604