- Merge pull request #4986 from ticoann/dbs3_location_call_change
  - fix getting local and prod instance for Datamapper, also change to new api to get location effiently