Add CPE info, and fix some whitespace issues.
PR: 204695 Submitted by: shun <shun.fbsd.pr@dropcut.net>