Refactor presence probe handling
Merge pull request #337 from esl/refactor-presence-probes

Refactor presence probe handling