Merge "Removing the Container Aware dependency from Clustering Services."

diff --combined opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java
index d67ee94b62e88fc3cf1157f878a373352651ff7a,c897e9a954d13cdcd8e086212e7a46d0b8edce78..c9190af03a587a76cd581591c59a33cc7036baee
--- 1/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java
--- 2/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java
+++ b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java
@@@ -291,10 -291,10 +291,10 @@@ public class ContainerManager extends A
              for (Match match : conf.getMatches()) {
                  ContainerFlow cFlow = new ContainerFlow(match);
                  if (delete) {
 -                    logger.trace("Removing Flow Spec %s from Container {}", conf.getName(), containerName);
 +                    logger.trace("Removing Flow Spec {} from Container {}", conf.getName(), containerName);
                      container.deleteFlowSpec(cFlow);
                  } else {
 -                    logger.trace("Adding Flow Spec %s to Container {}", conf.getName(), containerName);
 +                    logger.trace("Adding Flow Spec {} to Container {}", conf.getName(), containerName);
                      container.addFlowSpec(cFlow);
  
                  }
@@@ -1182,6 -1182,7 +1182,7 @@@
              }
          }
  
+         if (delete) clusterServices.removeContainerCaches(containerName);
          return status;
      }