Separate ping lifetime from beacons. Fixes #5424.
Merge pull request #5425 from pchote/pingfix

Separate ping lifetime from beacons.