Remove the assumption that we have unix-style newlines in the certificates. Checking for the newline is not strictly necessary, so just don't do it.
Merge branch 'branch_v2plus_3868' into branch_v2plus