Style fixes for trunk
Style fixes for trunk

This small patch fixes:
  - wrong indentation in two places
  - use of 'os' variable that hides global scope os module

Reviewed-by: imsnah


bitemyapp/ganeti,andir/ganeti,ganeti/ganeti,andir/ganeti,andir/ganeti,apyrgio/ganeti,dimara/ganeti,leshchevds/ganeti,grnet/snf-ganeti,leshchevds/ganeti,apyrgio/ganeti,yiannist/ganeti,ganeti-github-testing/ganeti-test-1,apyrgio/snf-ganeti,onponomarev/ganeti,yiannist/ganeti,mbakke/ganeti,leshchevds/ganeti,ganeti/ganeti,yiannist/ganeti,dimara/ganeti,onponomarev/ganeti,mbakke/ganeti,grnet/snf-ganeti,bitemyapp/ganeti,ganeti-github-testing/ganeti-test-1,apyrgio/snf-ganeti,ganeti/ganeti,mbakke/ganeti