Merge pull request #8068 from lodr/bug-840603-past-alarms

Bug 840603 - Autotriggering past alarms
Cuse r+(cherry picked from commit 194d07eb7856bceeb8b64579f9c85976debaa547)