Merge "libdiskconfig: 64-bit issues"