Merge "Fixing namespace+prefix mode in Expat and removing optional fields from callbacks."