Fixed typo montana-montara and updated p4c output

Change-Id: I76b4e1edb7cdb7de9927b806ef7e093782ac4078
diff --git a/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java b/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
index 7886b5c..c278829 100644
--- a/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
+++ b/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
@@ -52,7 +52,7 @@
 public class HwPipeconfLoader {
 
     private static final String MAVERICKS = "mavericks";
-    private static final String MONTANA = "montana";
+    private static final String MONTARA = "montara";
 
     private static final String PLAIN_FABRIC = "";
     private static final String WITH_SPGW = "-spgw";
@@ -62,7 +62,7 @@
             .of(PLAIN_FABRIC, WITH_SPGW);
 
     private static final Collection<String> PLATFORMS = ImmutableList
-            .of(MAVERICKS, MONTANA);
+            .of(MAVERICKS, MONTARA);
 
     private static final String BASE_PATH = "/p4c-out/tofino/fabric%s/%s";
     private static final String BASE_TOFINO_BIN_PATH = BASE_PATH + "/tofino.bin";