Merge "Enable art/tools/ahat to use apache-xml." into main