HCOLL-216 added better close support for the executor