Merge "Handle sigterm signal"

diff --combined development/docker-compose.yml
index 8b5854c,5d39a73..284199d
--- 1/development/docker-compose.yml
--- 2/development/docker-compose.yml
+++ b/development/docker-compose.yml
@@@ -67,7 -67,9 +67,9 @@@ services
                "--config-url", "http://consul-server:8500/v1/kv/veshv-config?raw=true",
                "--kafka-bootstrap-servers", "message-router-kafka:9092",
                "--key-store-password", "onaponap",
-               "--trust-store-password", "onaponap"]
+               "--trust-store-password", "onaponap",
+               "--first-request-delay", "2",
+               "--log-level", "DEBUG"]
      environment:
        JAVA_OPTS:  "-Dio.netty.leakDetection.level=paranoid"
      healthcheck:
@@@ -91,20 -93,12 +93,20 @@@
      image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator
      ports:
      - "6062:6062/tcp"
 +    - "6063:6063"
      command: ["--listen-port", "6062",
 +              "--health-check-api-port", "6063",
                "--ves-host", "ves-hv-collector",
                "--ves-port", "6061",
                "--key-store", "/etc/ves-hv/client.p12",
                "--key-store-password", "onaponap",
                "--trust-store-password", "onaponap"]
 +    healthcheck:
 +      test: curl -f http://localhost:6063/health/ready || exit 1
 +      interval: 10s
 +      timeout: 3s
 +      retries: 3
 +      start_period: 10s
      depends_on:
      - ves-hv-collector
      volumes:
@@@ -113,8 -107,8 +115,8 @@@
    dcae-app-simulator:
      image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator
      ports:
 -    - "6063:6063/tcp"
 -    command: ["--listen-port", "6063",
 +    - "6064:6064/tcp"
 +    command: ["--listen-port", "6064",
                "--kafka-bootstrap-servers", "message-router-kafka:9092",
                "--kafka-topics", "HV_VES_PERF3GPP"]
      depends_on: