Merge "Release VID 6.0.4 (Frankfurt)"

diff --combined vid-webpack-master/pom.xml
index ec7555d,ad8d9cb..d56a446
--- 1/vid-webpack-master/pom.xml
--- 2/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@@ -9,7 -9,7 +9,7 @@@
        inherit from a parent maven module. -->
    <groupId>org.onap.vid</groupId>
    <artifactId>vid-webpack-master</artifactId>
-   <version>6.0.4-SNAPSHOT</version>
+   <version>6.0.5-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>VID UI</name>
    <description>VID UI</description>
@@@ -201,6 -201,11 +201,6 @@@
                  <!-- Optional configuration which provides for running any npm command -->
                  <configuration>
                    <arguments>install --verbose cypress @bahmutov/add-typescript-to-cypress</arguments>
 -                  <environmentVariables>
 -                    <NO_PROXY>.att.com</NO_PROXY>
 -                    <http_proxy>http://one.proxy.att.com:8080</http_proxy>
 -                    <https_proxy>http://one.proxy.att.com:8080</https_proxy>
 -                  </environmentVariables>
                  </configuration>
                </execution>