Merge "BUG-272: remove trailing whitespace from XML files"