bug 1021018: XML generation should be a function of blobs, not handled externally. r=nthomas
Merge from upstream.