Merge "BUG-272: remove tabs from XML files"