Merge "Fix trailing whitespace (and mixed spaces) in XSD files"