IExecutorService cleanup
Merge pull request #3765 from pveentjer/cleanup/3.x/executor

IExecutorService cleanup