Merge "Set Activator alive to false in terminate"

diff --cc main/src/main/java/org/onap/policy/distribution/main/startstop/DistributionActivator.java
Simple merge

diff --cc main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java
index 47ac82b,294f908..d877e2a
--- 1/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java
--- 2/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java
+++ b/main/src/test/java/org/onap/policy/distribution/main/startstop/TestDistributionActivator.java
@@@ -61,9 -63,7 +63,10 @@@ public class TestDistributionActivator 
                  activator.getParameterGroup().getReceptionHandlerParameters()
                          .get(CommonTestData.DUMMY_RECEPTION_HANDLER_KEY).getPluginHandlerParameters()
                          .getPolicyForwarders().get(CommonTestData.DUMMY_ENGINE_FORWARDER_KEY).getForwarderType());
 +        assertEquals(DummyPolicyForwarderParameterGroup.class,
 +                activator.getParameterGroup().getPolicyForwarderConfigurationParameters()
 +                        .get(CommonTestData.FORWARDER_CONFIGURATION_PARAMETERS).getClass());
          activator.terminate();
+         assertFalse(DistributionActivator.isAlive());
      }
  }