Revert "Revert "Merge develop, fix conflicts""

KeywordSearch/ivy.xml

KeywordSearch/nbproject/project.properties

KeywordSearch/nbproject/project.xml

.../server/solr/configsets/AutopsyConfig/conf/solrconfig.xml

...org/sleuthkit/autopsy/keywordsearch/AdHocSearchPanel.java

...src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties

.../sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED

.../org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties

...arch/src/org/sleuthkit/autopsy/keywordsearch/Chunker.java

...uthkit/autopsy/keywordsearch/DropdownListSearchPanel.java

...leuthkit/autopsy/keywordsearch/ExtractAllTermsReport.java

...g/sleuthkit/autopsy/keywordsearch/IngestSearchRunner.java

...rch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java

...c/org/sleuthkit/autopsy/keywordsearch/InlineSearcher.java

...arch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java

...h/src/org/sleuthkit/autopsy/keywordsearch/KeywordHit.java

...keywordsearch/KeywordSearchGlobalSearchSettingsPanel.form

...keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java

...hkit/autopsy/keywordsearch/KeywordSearchIngestModule.java

...thkit/autopsy/keywordsearch/KeywordSearchJobSettings.java