make apply_defaults clearer
Merge branch 'vanchi/RADAR-16_maxPersistence' into vanchi/RADAR-22_maxPersistence_for_presence
use var
Merge branch 'vanchi/RADAR-16_maxPersistence' into vanchi/RADAR-22_maxPersistence_for_presence
apply_defaults for presence