Remove dead code
Ease a race condition in log rotation.
Merge branch 'develop' into numist/services-refactor