[PATCH 0/2] Adapt to latest libxml2