add xml_util test
Merge branch '2_10'