[MERGE] Merge branch 'stable-2.10' into stable-2.11

['Petr Pudlak' via ganeti-devel]

commit ec4e36a21a9c844de04508aebee85c5a3e2b4f3c
Merge: 84234ff c6199a4
Author: Petr Pudlak <pud...@google.com>
Date:   Thu Jul 17 10:21:26 2014 +0200

    Merge branch 'stable-2.10' into stable-2.11
    
    * stable-2.10
      Adapt relative path expansion in PATH to new environment
    
    * stable-2.9
      Make ganeti-cleaner switch to a save working directory