Fix regression concerning SONAR-5878 (custom working directory was not considered)