ContactInfo: prefix type parameters with the type-parameter name
ContactInfo: prefix type parameters with the type-parameter name

This means we can have language=foo as well as type=bar.

Also, add NICKNAME to the example vCard, to illustrate how we split
multi-valued vCard fields into multiple fields.

freedesktop-unofficial-mirror/telepathy__telepathy-spec,TelepathyIM/telepathy-spec