Merge pull request #735 from flapjack/734_maint_expiry_data

correct sched maint expiry from data before #634
Backport notification delays from master