Merge "Issue #1504 Fix merge error" into 13.2.1_delivery

Former-commit-id: a1d7a1cbc9 [formerly a1d7a1cbc9 [formerly 3a231135b5686e0c26e7d43d74d742b29ce88b1b]]
Former-commit-id: b7abb8d4e4
Former-commit-id: 8fb70d5ddc

edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java

@@ -167,6 +167,9 @@ public class GfeIngestNotificationFilter {
                     }
 
                     String level = GridTranslator.getShortLevelName(grid
+                            .getLevel().getMasterLevel().getName(), grid
+                            .getLevel().getLevelonevalue(), grid.getLevel()
+                            .getLeveltwovalue());
                     ParmID parmID = new ParmID(gfeParmName, dbId, level);
 
                     List<TimeRange> trs = gridInv.get(parmID);
@@ -228,7 +231,7 @@ public class GfeIngestNotificationFilter {
                             + parmId.toString(), e);
                 }
             }
-            
+
             try {
                 sendNotifications(guns);
             } catch (Exception e) {