[JENKINS-18574] Fixes for multiple locations in same repo
Merge pull request #85 from daniel-beck/JENKINS-18574-2

[JENKINS-18574] Fixes for multiple locations in same repo