Merge "Fix parsing of type heirarchy for nodetypes"

diff --cc participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandlerTest.java
Simple merge

diff --cc participant/participant-impl/participant-impl-http/src/test/java/utils/CommonTestData.java
Simple merge

diff --cc participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java
Simple merge