Merge "Clean up state of libxml on failed import."