Merge "Drools-App changes to support CQ"

diff --cc controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
Simple merge

diff --cc controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
index d8533c7,d722cc2..568f8bc
--- 1/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
--- 2/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
@@@ -131,9 -131,9 +131,9 @@@ public class ControlLoopOperationManage
          } catch (Exception e) {
              fail(e.getMessage());
          }
-         
+ 
          // Set PU
 -        System.setProperty("OperationsHistoryPU", "TestOperationsHistoryPU");
 +        System.setProperty("OperationsHistoryPU", "OperationsHistoryPUTest");
  
          // Enter dummy props to avoid nullPointerException
          PolicyEngine.manager.setEnvironmentProperty(org.onap.policy.guard.Util.ONAP_KEY_URL, "a");
@@@ -802,9 -806,9 +806,9 @@@
  
          assertEquals(PolicyResult.FAILURE, clom.onResponse(soRw));
  
 -        System.setProperty("OperationsHistoryPU", "TestOperationsHistoryPU");
 +        System.setProperty("OperationsHistoryPU", "OperationsHistoryPUTest");
          assertEquals(PolicyResult.FAILURE, clom.onResponse(soRw));
-     }    
+     }
  
      @Test
      public void testCommitAbatement() throws ControlLoopException, AaiException, IOException {
@@@ -899,9 -903,9 +903,9 @@@
          assertFalse(clom.isOperationRunning());
          assertEquals(1, clom.getHistory().size());
  
 -        System.setProperty("OperationsHistoryPU", "TestOperationsHistoryPU");
 +        System.setProperty("OperationsHistoryPU", "OperationsHistoryPUTest");
          assertEquals(PolicyResult.FAILURE, clom.onResponse(soRw));
-         
+ 
          clom = Serializer.roundTrip(clom);
          assertNotNull(clom);
          assertFalse(clom.isOperationRunning());