Merge "Reduce the number of raw-type related warnings in aai-common"

diff --cc aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java
Simple merge

diff --cc aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
Simple merge

diff --cc aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java
Simple merge

diff --cc aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java
Simple merge

diff --cc aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java
Simple merge

diff --cc aai-core/src/main/java/org/onap/aai/serialization/queryformats/HistoryFormat.java
Simple merge

diff --cc aai-core/src/main/java/org/onap/aai/serialization/queryformats/SimpleFormat.java
Simple merge

diff --cc aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java
Simple merge

diff --cc aai-core/src/main/java/org/onap/aai/util/RestController.java
Simple merge

diff --cc aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
Simple merge

diff --cc aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
Simple merge