Merge pull request #1970 from jestabro/xml-merge
xml: T5179: fix missed case in multi_to_list conversion