Restored white spaces and end of line characters

Some of the white spaces and end of line characters are lost during C5000 code
merge. Restored them to avoid dummy diffs.