Support for converting ANNIVERSARY

vcard 3 -> 4
------------

Find all X-ABDATE and X-ANNIVERSARY properties, and merge the ones with identical values. Convert all of these to ANNIVERSARY.

vcard 4 -> 3
------------

Convert ANNIVERSARY to both X-ABDATE and X-ANNIVERSARY.
Are there any material changes here, or is this just formatting?