Fix <url> -> <cvename> tags in OpenSSL entry plus spacing fixes.

While here, combine both entries as they both refer to the same CVEs and
we've typically done these as combined entries in the past.