Fixes issues prevents buildslave and buildbot from starting
Rewrite PATH extending logic