Merge "CPS-1401 Implement V2 of GET Data Node API"

diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
Simple merge

diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/InventoryPersistence.java
Simple merge

diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/InventoryPersistenceImpl.java
Simple merge

diff --cc cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/InventoryPersistenceImplSpec.groovy
Simple merge

diff --cc cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
Simple merge

diff --cc cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsDataPersistenceServiceIntegrationSpec.groovy
Simple merge

diff --cc cps-service/src/main/java/org/onap/cps/api/CpsDataService.java
Simple merge

diff --cc cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java
Simple merge

diff --cc cps-service/src/main/java/org/onap/cps/spi/CpsDataPersistenceService.java
Simple merge

diff --cc cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy
Simple merge