CAL-658: Restore some action labels in Event/Task forms
Merge commit '099c511d3fbf4dc6cbdfe886c61fd32a42a4d842' into HEAD