Fix description and spatial mapping for BPL

- Update enrich_location module to handle lists with both string
  and dictionariy values
Merge branch 'release-v9.2'