Merge "Policy Executor: handle errors, part 2 (fighting between IntelliJ and Checksty...

diff --cc cps-dependencies/pom.xml
Simple merge

diff --cc cps-parent/pom.xml
Simple merge

diff --cc cps-ri/pom.xml
Simple merge

diff --cc cps-ri/src/main/java/org/onap/cps/ri/repository/ModuleReferenceRepositoryImpl.java
Simple merge

diff --cc cps-service/pom.xml
Simple merge

diff --cc cps-service/src/main/java/org/onap/cps/utils/YangParserHelper.java
Simple merge