fixes #3688
Merge remote-tracking branch 'origin' into issue-3688-calendar-edit-this-instance-makes-loose-categories
Merge pull request #3695 from dotCMS/issue-3688-calendar-edit-this-instance-makes-loose-categories

Issue 3688 calendar edit this instance makes loose categories