Merge branch 'ss_builds' into development

Former-commit-id: 791639aecd4c192b4bb8d8bb692f2c696cde1daa

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java

@@ -25,6 +25,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -724,7 +725,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
 
     private List<String> getZoneList() {
         List<List<String>> zoneGroupings = zoneSelector.getZoneGroupings();
-        List<String> zoneList = null;
+        List<String> zoneList = Collections.emptyList();
         if (zoneGroupings.size() > 0) {
             zoneList = zoneGroupings.get(0);
         }

edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java

@@ -849,10 +849,10 @@ public class GFEDao extends DefaultPluginDao {
                 if (dTimeList.contains(tr)) {
                     timeList.add(new TimeRange(tr.getStart(), tr.getStart()));
                 }
+	    }
 
-                if (!timeList.isEmpty()) {
-                    return timeList;
-                }
+            if (!timeList.isEmpty()) {
+                return timeList;
             }
         } else {
             List<DataTime> results = executeD2DParmQuery(id);

rpms/build/common/lookupRPM.sh

@@ -117,6 +117,10 @@ function lookupRPM()
    fi
 
    # awips2 rpms.
+   if [ "${1}" = "Installer.ncep-database" ]; then
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ncep-database"
+      return 0
+   fi
    if [ "${1}" = "awips2-adapt-native" ]; then
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.adapt-native"
       return 0