Merge "[SDC-43] NFOD getVnfConfig support"

diff --cc src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
index e3b9937,590abd9..0ed4c97
--- 1/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
--- 2/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
+++ b/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
@@@ -22,9 -22,12 +22,10 @@@ package org.openecomp.sdc.tosca.parser.
  
  import java.util.*;
  import java.util.Map.Entry;
 -import java.util.regex.Matcher;
  import java.util.regex.Pattern;
  import java.util.stream.Collectors;
+ import java.util.stream.Stream;
  
 -import org.apache.commons.lang3.StringUtils;
  import org.apache.commons.lang3.tuple.ImmutablePair;
  import org.apache.commons.lang3.tuple.Pair;
  //import org.json.JSONObject;

diff --cc src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
Simple merge