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