Bug 1018833 - Calendar sync duplicates events r=gaye

making a separate PR targeting 2.1 to speed up the uplift process (specially since we might need to rebase changes after AMD modules)
I think we do need, because `expand` receives a callback which might never be triggered.