BZ-1108472: enhancements on shutdown executor services