#1196 py3: Fix location handling

13 jobs for !3045 with noc-1196 in 41 minutes and 3 seconds (queued for 2 seconds)
merge request