Bug 846079 - cleanup / lint stuff
Merge pull request #11617 from KevinGrandon/lightsofapollo-calendar-fix-some-review-stuff

Bug 846079 - cleanup / lint stuff r=kgrandon