Merge pull request #223 from wagnert/master

Bugfix invalid parameter dir when calling AbstractService::cleanUpDir() ...
Merge pull request #224 from wagnert/master

Refactor container startup process to make sure all server sockets has b...