fixes #2239 API v2 CRUD for locations and organizations 

FYI.  includes commit from pr #422