[Libguestfs] [PATCH 0/2 febootstrap] Allow zero-size conflicting config files to be combined