Merge with Debian

dbus-deviation has been accepted to Debian with some changes compared to what we captured in our Git repo previously.

This MR syncs those changes into our branch.