CAL-342 fix calendar activity for repetitive events
merge with origin/feature/activity-type