Log the error if we have it.
Fix the $and portion of the aggregation.
Fix handling event descriptions if they are provided in HTML/RTF.

Possible fix for Bug: 12797
Merge branch 'master' into horde_5_2
Check incoming appointments for HTML body types.
Merge branch 'master' into horde_5_2