Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x

includes/datastream.inc

@@ -43,6 +43,7 @@ function islandora_view_datastream(FedoraDatastream $datastream, $download = FAL
   }
   drupal_page_is_cacheable(FALSE);
   // Try not to load the file into PHP memory!
+  ob_end_flush();
   $datastream->getContent('php://output');
   exit();
 }

includes/solution_packs.inc

@@ -186,12 +186,10 @@ function islandora_solution_pack_form_submit(array $form, array &$form_state) {
  *   The context of this batch operation.
  */
 function islandora_solution_pack_batch_operation_reingest_object(NewFedoraObject $object, array &$context) {
-  $deleted = FALSE;
   $existing_object = islandora_object_load($object->id);
   if ($existing_object) {
     $deleted = islandora_delete_object($existing_object);
-    $purged = $deleted && $existing_object == NULL;
-    if (!$purged) {
+    if (!$deleted) {
       $object_link = l($existing_object->label, "islandora/object/{$existing_object->id}");
       drupal_set_message(t('Failed to purge existing object !object_link.', array(
             '!object_link' => $object_link,