Fix trailing whitespace issues
Merge remote-tracking branch 'origin/addmesos'