Merge pull request #1281 from danmcp/master

Bug 901444
Fix _id to uuid issue with districts