Changed method of looking up locality of machine
Merge branch 'master' into jenkins