Merge "Multiple fixes related to VPN concurrency"

diff --combined vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
index 27674ea26215db09ec70c0fb4b35806ae2685a94,d0bc87a4ba0cf0ffa9d7b4084b65b46214f2f664..a14155edff10bd423d569bbcd8c548e9f668b934
--- 1/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
--- 2/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
@@@ -104,7 -104,7 +104,7 @@@ public class BgpManager implements Bind
                      LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Bgp.class));
              return optional.get();
          } catch (Exception e) {
 -            LOGGER.error("failed to get bgp config",e);
 +            //LOGGER.error("failed to get bgp config",e);
          }
          return null;
      }
@@@ -143,8 -143,10 +143,10 @@@
      }
  
      @Override
-     public void deleteVrf(String rd) throws Exception {
-         fibDSWriter.removeVrfFromDS(rd);
+     public void deleteVrf(String rd, boolean removeFibTable) throws Exception {
+         if (removeFibTable) {
+             fibDSWriter.removeVrfFromDS(rd);
+         }
          bcm.delVrf(rd);
      }