Fixed the OSGi failures

 - https://hibernate.atlassian.net/browse/HSEARCH-1627
 - https://hibernate.atlassian.net/browse/HSEARCH-1628