Merge pull request #2604 from sammj/xml

firestone: Bump xml version