Fixes #6457,BZ1115089 - Match multiple items on contents changed

The problem when uploading multiple items is that we were doing a unit search
that could have multiple results but we were only looking at the first one. We
need to get the ids of all.
Merge pull request #4372 from daviddavis/temp/20140701103734

Fixes #6457,BZ1115089 - Match multiple items on contents changed