HSEARCH-1696 Adjust HSEARCH-1692 branch to Wildfly and branch 4.5