Fix merging of ServiceLoader files in uberjar.

Add carriage return and newline, if missing, to ServiceLoader files
before merging them.