Initial import of CFM and SOAM api 1.10

Change-Id: Icf5cc2d5fb34b75460e80e8cced0d70265bcd33b

Minor changes to get CFM and SOAM patch work on 1.10

Change-Id: Ibd90fdeaf143f4cfdc98f7e6eb28bfa55f471e4b
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 226af15..e0148bb 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -57,10 +57,10 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
+         <dependency>
+             <groupId>com.google.guava</groupId>
+             <artifactId>guava</artifactId>
+         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onlab-misc</artifactId>