Merge pull request #870 from igiguere/NUTCH-2971

Fix for NUTCH-2971: Unt tests fail with JDK 17