PAHMA-1017: correct tie-breaking in findcurrentlocations()
Merge branch 'master' of https://github.com/cspace-deployment/Tools