Use the whitespace linter and fix the reported problems. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <paul.holzinger@web.de> <MH: Fixed up cherry-pick conflicts> Signed-off-by: Matthew Heon <mheon@redhat.com>