Minor typos and trailing spaces

Fix typos and trailing spaces.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
Merge pull request #3022 from leseb/fix-opts

Minor typos and trailing spaces

Reviewed-by: Loic Dachary <ldachary@redhat.com>