Enabling discovery of ROADM and OTN devices under "Optical UI" tab. Trying again.

Change-Id: I370b34f1d2c082d0e8bb03a428023b586326d429
(cherry picked from commit f5c0a09dabab16b8c5c39f25e70788ad159827ec)
diff --git a/apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmDeviceViewMessageHandler.java b/apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmDeviceViewMessageHandler.java
index b9506d2..9049f4a 100644
--- a/apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmDeviceViewMessageHandler.java
+++ b/apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmDeviceViewMessageHandler.java
@@ -94,6 +94,8 @@
                 Type type = device.type();
                 if (type == Type.ROADM || type == Type.TERMINAL_DEVICE
                         || type == Type.OPTICAL_AMPLIFIER || type == Type.FIBER_SWITCH
+                        || type == Type.ROADM_OTN
+                        || type == Type.OTN
                         || type == Type.OLS) {
                     populateRow(tm.addRow(), device);
                 }