HSEARCH-1721 JDK9 compatibility