This brings the calendar display in-line with the printed output.
The calendar entries can be reverted to the pre-6.5.5 behavior via the OldCalConflicts parameter in the notes.ini on the client.