Merge pull request #1283 from danmcp/master

Fix district _id -> uuid
missed a file
adjust to 1.8.1 driver