Merge branch 'develop' of https://github.com/sleuthkit/autopsy into index1

Core/src/org/sleuthkit/autopsy/casemodule/services/Blackboard.java

@@ -31,9 +31,6 @@ import org.sleuthkit.datamodel.TskCoreException;
  */
 public final class Blackboard implements Closeable {
 
-    Blackboard() {
-    }
-
     /**
      * Index the text associated with the given artifact.
      *

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java

@@ -162,6 +162,7 @@ public class SolrSearchService implements KeywordSearchService {
         try {
             Ingester.getDefault().ingest(contentStream, solrFields, contentStream.getSize());
         } catch (Ingester.IngesterException ex) {
+            throw new TskCoreException(ex.getCause().getMessage(), ex);
         }
     }