Bug 829562 - Clean up alarm logic in calendar.
Merge pull request #7614 from KevinGrandon/bug_829562_alarm_logic

Bug 829562 - Clean up alarm logic in calendar.