Merge "Change .dbus.xml extension to .dbus-xml"