prevent creation of Zombie processes when running lsof
Merge branch '2.3.x' into devel