Factoring out uploadDir 
Merge branch 'master' of https://github.com/tkafalas/pentaho-platform.git