reset the old timeout and put a check on fiel usage of thread
Merge branch 'development' of ssh://opensource-stash.infn.it:7999/chaos/chaosframework into development