Issue #2380701 by draenen: Allow grace periods to avoid membership lapse