HCOLL-167 added a       executorService.awaitTermination(5, TimeUnit.SECONDS);