Remove unneeded whitespace, and fix a license for a new file. Extracted
from a larger patch.

Submitted by: Emmanuel Vadot <manu@bidouilliste.com>
X-Differential Revision: https://reviews.freebsd.org/D4792