Format to UNIX line endings
Apply java changes AGAIN