Make islandora_importer break correctly.
Merge remote branch 'upstream/7.x' into flvc