executor service improvements
MapStore changed to use single thread executor
fix removal of registered executor for mapstore
Merge pull request #1614 from eminn/maintenance-3.x

[backport] MapStore changed to use single thread executor