[folks] (4 commits) Non-fast-forward update to branch wip/nielsdg/fix-folks

[Niels De Graef <nielsdg src gnome org>]

The branch 'wip/nielsdg/fix-folks' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  6a9fdff... tests/eds: Don't hardcode E-D-S DBus names

Commits added to the branch:

  5c039e6... Key-file: implement LocalIdDetails (*)
  fdf2455... Linking: store linking personas in key-file (*)
  c6fc0ce... meson: Make sure we install the GConf file (*)
  3fbc744... tests/eds: Don't hardcode E-D-S DBus names

(*) This commit already existed in another branch; no separate mail sent