Fix inconsistent line endings in files generated by workbench command

Change all affected files from \r\n to \n.
Fix conflicts.