Merge "Remove some unused TFTP and DBUS support"