make user-location upload fail gracefully when a bad location is specified

http://manage.dimagi.com/default.asp?113993
fix deleting locations in bulk upload
clean tests
Merge pull request #3450 from dimagi/user-location-upload-fix

make user-location upload fail gracefully when a bad location is specified