[sonic-cfggen]: fix bgpd and zebra template for sonic-cfggen test

I took the original patch (bebb7a0) into 201803 branch need to also
adapt the patch since we do not have commit (d423841) in 201803 branch.

Signed-off-by: Guohan Lu <gulv@microsoft.com>

src/sonic-config-engine/tests/sample_output/bgpd.conf

@@ -27,13 +27,6 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   network 192.168.0.1/27
-  neighbor 10.0.0.57 remote-as 64600
-  neighbor 10.0.0.57 description ARISTA01T1
-  address-family ipv4
-    neighbor 10.0.0.57 allowas-in 1
-    neighbor 10.0.0.57 activate
-    maximum-paths 64
-  exit-address-family
   neighbor 10.0.0.59 remote-as 64600
   neighbor 10.0.0.59 description ARISTA02T1
   address-family ipv4
@@ -55,25 +48,25 @@ router bgp 65100
     neighbor 10.0.0.63 activate
     maximum-paths 64
   exit-address-family
-  neighbor fc00::7a remote-as 64600
-  neighbor fc00::7a description ARISTA03T1
-  address-family ipv6
-    neighbor fc00::7a allowas-in 1
-    neighbor fc00::7a activate
-    maximum-paths 64
-  exit-address-family
   neighbor fc00::7e remote-as 64600
   neighbor fc00::7e description ARISTA04T1
   address-family ipv6
     neighbor fc00::7e allowas-in 1
     neighbor fc00::7e activate
     maximum-paths 64
   exit-address-family
-  neighbor fc00::72 remote-as 64600
-  neighbor fc00::72 description ARISTA01T1
+  neighbor fc00::7a remote-as 64600
+  neighbor fc00::7a description ARISTA03T1
   address-family ipv6
-    neighbor fc00::72 allowas-in 1
-    neighbor fc00::72 activate
+    neighbor fc00::7a allowas-in 1
+    neighbor fc00::7a activate
+    maximum-paths 64
+  exit-address-family
+  neighbor 10.0.0.57 remote-as 64600
+  neighbor 10.0.0.57 description ARISTA01T1
+  address-family ipv4
+    neighbor 10.0.0.57 allowas-in 1
+    neighbor 10.0.0.57 activate
     maximum-paths 64
   exit-address-family
   neighbor fc00::76 remote-as 64600
@@ -83,6 +76,13 @@ router bgp 65100
     neighbor fc00::76 activate
     maximum-paths 64
   exit-address-family
+  neighbor fc00::72 remote-as 64600
+  neighbor fc00::72 description ARISTA01T1
+  address-family ipv6
+    neighbor fc00::72 allowas-in 1
+    neighbor fc00::72 activate
+    maximum-paths 64
+  exit-address-family
 !
 maximum-paths 64
 !

src/sonic-config-engine/tests/sample_output/zebra.conf

@@ -9,13 +9,13 @@ password zebra
 enable password zebra
 !
 ! Enable link-detect (default disabled)
-interface PortChannel01
+interface PortChannel03
 link-detect
 !
 interface PortChannel02
 link-detect
 !
-interface PortChannel03
+interface PortChannel01
 link-detect
 !
 interface PortChannel04