Merge "Remove libdiskconfig as it is no longer used"