Fix for bug 923176
 - Handling missing or empty component_instances
 - Handling false positives for UID checks for districts
Merge pull request #1720 from abhgupta/abhgupta-dev

Merged by openshift-bot