catch Inconsistent errors on bulk user upload and don't fail hard
Merge pull request #3316 from dimagi/userupload

catch Inconsistent errors on bulk user upload and don't fail hard