Merge remote-tracking branch 'upstream/master'
Fix to handle multiple initial locations
Merge pull request #3 from saewill/master

Add fix_testfiles.sh to dCache Utilities