[Bug 226566] Merge Review: xmlsec1