Stage refactoring
Stage refactoring
Staging running version, which could be run in OpenNMS
Fixed awaiting timeot for threadpool
Merged from master