[gnome-settings-daemon] (6 commits) Non-fast-forward update to branch benzea/prepare-for-new-dbusmock

[Benjamin Berg <bberg src gnome org>]

The branch 'benzea/prepare-for-new-dbusmock' 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:

  2551d82... tests: Enable dconf service for new dbusmock compatibility
  df74728... power: Fix mutter version check in test code

Commits added to the branch:

  c8981ef... keyboard: "Migrate" gtk-im-context setting before giving co (*)
  3a966eb... tests: Update Mutter version dependency (*)
  b10f273... Release 42.0 (*)
  946e4bb... Release 42.1 (*)
  4b1ecfa... tests: Enable dconf service for new dbusmock compatibility
  15dc11c... power: Fix mutter version check in test code

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