Remove default flow rules for ROADMs. Fix LinkResource NPE. Single instance provisions optical path.

Change-Id: Iacbd41403ecd0c0df240d09026253c4b761a1d6a
diff --git a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
index f7be862..a601b23 100644
--- a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
+++ b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
@@ -112,7 +112,7 @@
         provider.coreService = coreService;
 
         provider.deviceService = deviceService;
-        provider.packetSevice = packetService;
+        provider.packetService = packetService;
         provider.providerRegistry = linkService;
         provider.masterService = masterService;
 
@@ -204,7 +204,7 @@
         provider.coreService = null;
         provider.providerRegistry = null;
         provider.deviceService = null;
-        provider.packetSevice = null;
+        provider.packetService = null;
     }
 
     private DeviceEvent deviceEvent(DeviceEvent.Type type, DeviceId did) {