[JENKINS-18574] Fixes for multiple locations in same repo
Merge remote-tracking branch 'db/JENKINS-18574-2'