ContactManager: Make sure FeatureAvatarToken is added to feature if FeatureAvatarData is requested even if the ContactFactory does not contain FeatureAvatarData.
ContactManager: Make sure FeatureAvatarToken is added to feature if FeatureAvatarData is requested even if the ContactFactory does not contain FeatureAvatarData.

freedesktop-unofficial-mirror/telepathy__telepathy-qt,tiagosh/telepathy-qt,TelepathyIM/telepathy-qt,detrout/telepathy-qt,freedesktop-unofficial-mirror/telepathy__telepathy-qt4,tiagosh/telepathy-qt,detrout/telepathy-qt,freedesktop-unofficial-mirror/telepathy__telepathy-qt,TelepathyIM/telepathy-qt,freedesktop-unofficial-mirror/telepathy__telepathy-qt4,special/telepathy-qt-upstream,detrout/telepathy-qt,TelepathyIM/telepathy-qt,anantkamath/telepathy-qt,TelepathyIM/telepathy-qt,freedesktop-unofficial-mirror/telepathy__telepathy-qt4,special/telepathy-qt-upstream,tiagosh/telepathy-qt,TelepathyQt/telepathy-qt,freedesktop-unofficial-mirror/telepathy__telepathy-qt4,freedesktop-unofficial-mirror/telepathy__telepathy-qt,TelepathyIM/telepathy-qt,special/telepathy-qt-upstream,tiagosh/telepathy-qt,freedesktop-unofficial-mirror/telepathy__telepathy-qt,TelepathyQt/telepathy-qt,TelepathyQt/telepathy-qt,anantkamath/telepathy-qt,anantkamath/telepathy-qt,TelepathyQt/telepathy-qt