fix sorting bug dealing with improper organization_name mapping
fix bug where deployment is None for some reason)
Merge pull request #1360 from dimagi/domains

2 separate bug fixes for hqadmin project space report