diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 2b9b13caf7..b73c5ba277 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -18,7 +18,10 @@ file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbi
 file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
 file.reference.sqlite-jdbc-3.8.11.jar=release/modules/ext/sqlite-jdbc-3.8.11.jar
 file.reference.StixLib.jar=release/modules/ext/StixLib.jar
+<<<<<<< HEAD
 file.reference.sleuthkit-postgresql-4.6.1.jar=release/modules/ext/sleuthkit-postgresql-4.6.1.jar
+=======
+>>>>>>> upstream/custom-release-may-2018
 file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar
 file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0.1.jar
 file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar
@@ -28,6 +31,7 @@ file.reference.cxf-rt-transports-http-3.0.16.jar=release/modules/ext/cxf-rt-tran
 file.reference.fontbox-2.0.8.jar=release/modules/ext/fontbox-2.0.8.jar
 file.reference.pdfbox-2.0.8.jar=release/modules/ext/pdfbox-2.0.8.jar
 file.reference.pdfbox-tools-2.0.8.jar=release/modules/ext/pdfbox-tools-2.0.8.jar
+file.reference.sleuthkit-postgresql-4.6.1.jar=release/modules/ext/sleuthkit-postgresql-4.6.1.jar
 file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar
 file.reference.tika-parsers-1.17.jar=release/modules/ext/tika-parsers-1.17.jar
 file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
index 1e439cb39d..c6587da68d 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
@@ -306,7 +306,7 @@ public final class ThunderbirdMboxFileIngestModule implements FileIngestModule {
      * @throws NoCurrentCaseException if there is no open case.
      * @return the temporary folder
      */
-    public static String getTempPath() throws NoCurrentCaseException {
+    static String getTempPath() throws NoCurrentCaseException {
         String tmpDir = Case.getOpenCase().getTempDirectory() + File.separator
                 + "EmailParser"; //NON-NLS
         File dir = new File(tmpDir);
@@ -322,7 +322,7 @@ public final class ThunderbirdMboxFileIngestModule implements FileIngestModule {
      * @throws NoCurrentCaseException if there is no open case.
      * @return the module output folder
      */
-    public static String getModuleOutputPath() throws NoCurrentCaseException {
+    static String getModuleOutputPath() throws NoCurrentCaseException {
         String outDir = Case.getOpenCase().getModuleDirectory() + File.separator
                 + EmailParserModuleFactory.getModuleName();
         File dir = new File(outDir);
@@ -338,7 +338,7 @@ public final class ThunderbirdMboxFileIngestModule implements FileIngestModule {
      * @throws NoCurrentCaseException if there is no open case.
      * @return the relative path of the module output folder
      */
-    public static String getRelModuleOutputPath() throws NoCurrentCaseException {
+    static String getRelModuleOutputPath() throws NoCurrentCaseException {
         return Case.getOpenCase().getModuleOutputDirectoryRelativePath() + File.separator
                 + EmailParserModuleFactory.getModuleName();
     }