remove trailing whitespace
Merge pull request #366 from justinstoller/maint/3.3.x/trailing_whitespace

remove trailing whitespace
This fixes this test to work in the face of oppressive SELinux!
Merge branch 'master' into 3.3.x
Missing lsbdistid stub for apt module
Merge pull request #369 from hunner/fix_lsbdistid

Missing lsbdistid stub for apt module