CLOUDIFY-1930 Replaced new Thread with ExecutorService
CLOUDIFY-1930 Added back line that was deleted by mistake