Bug 983846 - Refactor calendar marionette abstractions r=millermedeiros