[SDC] 1710 rebase + pom modifications

Change-Id: I1f9c0a5201576c7a6b124f6a786db12c1a8cd7c0
Signed-off-by: Michael Lando <ml636r@att.com>

48 files changed, 319 insertions, 836 deletions

diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index 02092fdaf3..7e7476253a 100644
--- a/asdc-tests/pom.xml
+++ b/asdc-tests/pom.xml
@@ -291,32 +291,6 @@
 	<build>
 		<plugins>
 
-			<!-- ============================================= -->
-			<!-- Get the next build number -->
-			<!-- ============================================= -->
-			<!--<plugin>-->
-				<!--<groupId>org.codehaus.mojo</groupId>-->
-				<!--<artifactId>properties-maven-plugin</artifactId>-->
-				<!--<version>1.0-alpha-1</version>-->
-				<!--<inherited>false</inherited>-->
-
-				<!--<executions>-->
-					<!--<execution>-->
-						<!--<id>tests</id>-->
-						<!--<phase>initialize</phase>-->
-						<!--<goals>-->
-							<!--<goal>read-project-properties</goal>-->
-						<!--</goals>-->
-
-						<!--<configuration>-->
-							<!--<files>-->
-								<!--<file>../target/FullReleaseVersion.properties</file>-->
-							<!--</files>-->
-						<!--</configuration>-->
-					<!--</execution>-->
-				<!--</executions>-->
-			<!--</plugin>-->
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -355,31 +329,5 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<!-- =========================== -->
-					<!-- HP Fortifay scanner -->
-					<!-- =========================== -->
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<scanEnabled>false</scanEnabled>
-							<skip>true</skip>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
 
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index a7a122f43b..88031c8e44 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -598,28 +598,4 @@
             </plugin>
 		</plugins>
 	</build>
-
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/config/MigrationSpringConfig.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/config/MigrationSpringConfig.java
index 0457c2136d..4d52347788 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/config/MigrationSpringConfig.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/config/MigrationSpringConfig.java
@@ -6,7 +6,7 @@ import org.openecomp.sdc.asdctool.migration.resolver.MigrationResolver;
 import org.openecomp.sdc.asdctool.migration.resolver.SpringBeansMigrationResolver;
 import org.openecomp.sdc.asdctool.migration.service.SdcRepoService;
 import org.openecomp.sdc.be.dao.cassandra.CassandraClient;
-import org.openecomp.sdc.be.dao.cassandra.MigrationTasksDao;
+import org.openecomp.sdc.asdctool.migration.dao.MigrationTasksDao;
 import org.openecomp.sdc.be.dao.config.DAOSpringConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -56,4 +56,6 @@ public class MigrationSpringConfig {
         return new CassandraClient();
     }
 
+
+
 }
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutionResult.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutionResult.java
index 4ebec6e440..accd9eca53 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutionResult.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutionResult.java
@@ -13,6 +13,7 @@ public class MigrationExecutionResult {
     private double executionTime;
     private DBVersion version;
     private String taskName;
+    private String description;
 
     public MigrationTaskEntry toMigrationTaskEntry() {
         MigrationTaskEntry migrationTaskEntry = new MigrationTaskEntry();
@@ -23,6 +24,7 @@ public class MigrationExecutionResult {
         migrationTaskEntry.setTaskStatus(this.getMigrationStatus().name());
         migrationTaskEntry.setMessage(this.getMsg());
         migrationTaskEntry.setExecutionTime(this.getExecutionTime());
+        migrationTaskEntry.setDescription(this.getDescription());
         return migrationTaskEntry;
     }
 
@@ -67,4 +69,11 @@ public class MigrationExecutionResult {
         this.taskName = taskName;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImpl.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImpl.java
index 2e4d3ba8b0..39219aee23 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImpl.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImpl.java
@@ -41,6 +41,7 @@ public class MigrationExecutorImpl implements MigrationExecutor {
         migrationExecutionResult.setMsg(migrationResult.getMsg());
         migrationExecutionResult.setTaskName(migration.getClass().getName());
         migrationExecutionResult.setVersion(migration.getVersion());
+        migrationExecutionResult.setDescription(migration.description());
         return migrationExecutionResult;
     }
 
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/MigrationTasksAccessor.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/dao/MigrationTasksAccessor.java
index e548a594d9..1e336e45d1 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/MigrationTasksAccessor.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/dao/MigrationTasksAccessor.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.dao.cassandra;
+package org.openecomp.sdc.asdctool.migration.dao;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.mapping.annotations.Accessor;
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/MigrationTasksDao.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/dao/MigrationTasksDao.java
index 89ad9662fa..03fd8d1e7d 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/MigrationTasksDao.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/dao/MigrationTasksDao.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.dao.cassandra;
+package org.openecomp.sdc.asdctool.migration.dao;
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
@@ -7,6 +7,8 @@ import com.datastax.driver.mapping.Mapper;
 import com.datastax.driver.mapping.MappingManager;
 import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.dao.cassandra.CassandraDao;
+import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
 import org.openecomp.sdc.be.resources.data.MigrationTaskEntry;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
 import org.slf4j.Logger;
@@ -16,7 +18,6 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 import java.math.BigInteger;
 
-@Component("sdc-migration-tasks-cassandra-dao")
 public class MigrationTasksDao extends CassandraDao {
 
     private static Logger logger = LoggerFactory.getLogger(MigrationTasksDao.class.getName());
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoService.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoService.java
index 2888ecb474..20451f2c63 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoService.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoService.java
@@ -1,7 +1,7 @@
 package org.openecomp.sdc.asdctool.migration.service;
 
 import org.openecomp.sdc.asdctool.migration.core.DBVersion;
-import org.openecomp.sdc.be.dao.cassandra.MigrationTasksDao;
+import org.openecomp.sdc.asdctool.migration.dao.MigrationTasksDao;
 import org.openecomp.sdc.be.resources.data.MigrationTaskEntry;
 
 import java.math.BigInteger;
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java
index 763d6c83d2..7d8cc5aa78 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java
@@ -1,5 +1,6 @@
 package org.openecomp.sdc.asdctool.migration.core.execution;
 
+import org.openecomp.sdc.asdctool.migration.DummyMigrationFactory;
 import org.openecomp.sdc.asdctool.migration.core.DBVersion;
 import org.openecomp.sdc.asdctool.migration.core.task.Migration;
 import org.openecomp.sdc.asdctool.migration.core.task.MigrationResult;
@@ -12,36 +13,18 @@ public class MigrationExecutorImplTest {
 
     @Test
     public void testExecuteMigration() throws Exception {
-        MigrationExecutionResult execute = new MigrationExecutorImpl().execute(new DummyMigration());
-
+        MigrationExecutionResult execute = new MigrationExecutorImpl().execute(DummyMigrationFactory.SUCCESSFUL_MIGRATION);
+        assertMigrationTaskEntryByMigrationExecutionResult(execute, DummyMigrationFactory.SUCCESSFUL_MIGRATION);
     }
 
-    private void assertMigrationTaskEntryByMigrationExecutionResult(MigrationExecutionResult executionResult, Migration migration, MigrationResult result) {
-        assertEquals(executionResult.getMsg(), result.getMsg());
-        assertEquals(executionResult.getMigrationStatus().name(), result.getMigrationStatus());
+    private void assertMigrationTaskEntryByMigrationExecutionResult(MigrationExecutionResult executionResult, Migration migration) {
+        MigrationResult migrationResult = migration.migrate();
+        assertEquals(executionResult.getMsg(), migrationResult.getMsg());
+        assertEquals(executionResult.getMigrationStatus(), migrationResult.getMigrationStatus());
         assertEquals(executionResult.getTaskName(), migration.getClass().getName());
         assertEquals(executionResult.getVersion(), migration.getVersion());
+        assertEquals(executionResult.getDescription(), migration.description());
         assertNotNull(executionResult.getExecutionTime());
     }
 
-    private class DummyMigration implements Migration {
-
-        @Override
-        public String description() {
-            return null;
-        }
-
-        @Override
-        public DBVersion getVersion() {
-            return DBVersion.fromString("1710.22");
-        }
-
-        @Override
-        public MigrationResult migrate() {
-            MigrationResult migrationResult = new MigrationResult();
-            migrationResult.setMigrationStatus(MigrationResult.MigrationStatus.COMPLETED);
-            migrationResult.setMsg("myMsg");
-            return migrationResult;
-        }
-    }
 }
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java
index f8e9abe2c9..705f8d13e6 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java
@@ -5,7 +5,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.internal.verification.Times;
 import org.openecomp.sdc.asdctool.migration.core.DBVersion;
-import org.openecomp.sdc.be.dao.cassandra.MigrationTasksDao;
+import org.openecomp.sdc.asdctool.migration.dao.MigrationTasksDao;
 import org.openecomp.sdc.be.resources.data.MigrationTaskEntry;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 9d736022a0..963bcf99e7 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -831,61 +831,5 @@
             	<finalName>${project.artifactId}-${project.version}</finalName>            	
             </build>
         </profile>
-        
-        <profile>
-            <id>build</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-
-
-            <build>            
-				<finalName>${project.artifactId}-${full.release.version}</finalName>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <version>1.0-alpha-2</version>
-
-                        <executions>
-                            <execution>
-                                <inherited>false</inherited>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>read-project-properties</goal>
-                                </goals>
-                                <configuration>
-                                    <files>
-                                        <file>${project.parent.build.directory}/FullReleaseVersion.properties</file>
-                                    </files>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
index 77900efd82..e4c75eab05 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
@@ -111,9 +111,7 @@ import org.openecomp.sdc.exception.ResponseFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
+import org.xml.sax.*;
 import org.yaml.snakeyaml.Yaml;
 
 import com.google.gson.Gson;
@@ -2038,6 +2036,17 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
 	@SuppressWarnings("restriction")
 	public boolean isValidXml(byte[] xmlToParse) {
 		XMLReader parser = new SAXParser();
+		try {
+			parser.setFeature("http://apache.org/xml/features/validation/schema", false);
+		} catch (SAXNotRecognizedException e) {
+			e.printStackTrace();
+			log.debug("Xml parser couldn't set feature: \"http://apache.org/xml/features/validation/schema\", false", e.getMessage(), e);
+
+		} catch (SAXNotSupportedException e) {
+			e.printStackTrace();
+			log.debug("Xml parser couldn't set feature: \"http://apache.org/xml/features/validation/schema\", false", e.getMessage(), e);
+
+		}
 		boolean isXmlValid = true;
 		try {
 			parser.parse(new InputSource(new ByteArrayInputStream(xmlToParse)));
@@ -4007,7 +4016,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
 	}
 
 	private Either<Either<ArtifactDefinition,Operation>,ResponseFormat> getResponseAndAuditInvalidEmptyHeatEnvFile(AuditingActionEnum auditingAction, Component parent, String uniqueId, User user, ArtifactDefinition currHeatArtifact, String artifactId, ComponentTypeEnum componentType) {
-		ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_YAML);
+		ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_YAML, currHeatArtifact.getArtifactName());
 		handleAuditing(auditingAction, parent, parent.getUniqueId(), user, currHeatArtifact, null, artifactId, responseFormat, componentType, "");
 		return Either.right(responseFormat);
 	}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
index 56cd91d754..5b6488d788 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
@@ -42,12 +42,15 @@ import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
 import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.info.CreateAndAssotiateInfo;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.Component;
@@ -65,11 +68,13 @@ import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
 import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.IComponentInstanceOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
+import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.resources.data.ComponentInstanceData;
@@ -487,7 +492,7 @@ public abstract class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 			}
 			Component origComponent = eitherResourceName.left().value();
 
-			resultOp = updateComponentInstanceMetadata(containerComponent, containerComponentType, origComponent, componentInstanceId, componentInstance, inTransaction);
+			resultOp = updateComponentInstanceMetadata(containerComponent, containerComponentType, origComponent, componentInstanceId, componentInstance);
 			return resultOp;
 
 		} finally {
@@ -562,7 +567,8 @@ public abstract class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 					Optional<ComponentInstance> op = componentInstanceList.stream().filter(ci -> ci.getUniqueId().equals(origInst.getUniqueId())).findAny();
 					if(op.isPresent()){
 						ComponentInstance updatedCi = op.get();	
-						updatedCi.setCustomizationUUID(origInst.getCustomizationUUID());
+						updatedCi = buildComponentInstance(updatedCi, origInst);
+						
 						Boolean isUniqueName = validateInstanceNameUniquenessUponUpdate(containerComponent, origInst, updatedCi.getName());
 						if(!isUniqueName){
 							CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update the name of the component instance {} to {}. A component instance with the same name already exists. ",
@@ -617,7 +623,7 @@ public abstract class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 	}
 
 	private Either<ComponentInstance, ResponseFormat> updateComponentInstanceMetadata(Component containerComponent, ComponentTypeEnum containerComponentType, org.openecomp.sdc.be.model.Component origComponent, String componentInstanceId,
-			ComponentInstance componentInstance, boolean inTransaction) {
+			ComponentInstance componentInstance) {
 
 		Either<ComponentInstance, ResponseFormat> resultOp = null;
 		Optional<ComponentInstance> componentInstanceOptional = null;
@@ -1872,4 +1878,40 @@ public abstract class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 		}
 		return result;
 	}
+	
+	private ComponentInstance buildComponentInstance(ComponentInstance resourceInstanceForUpdate, ComponentInstance origInstanceForUpdate) {	
+
+		Long creationDate = origInstanceForUpdate.getCreationTime();		
+		
+		Long modificationTime = System.currentTimeMillis();
+		resourceInstanceForUpdate.setCreationTime(creationDate);
+		resourceInstanceForUpdate.setModificationTime(modificationTime);
+		
+		resourceInstanceForUpdate.setCustomizationUUID(origInstanceForUpdate.getCustomizationUUID());
+		
+		if (StringUtils.isEmpty(resourceInstanceForUpdate.getName())) {
+			resourceInstanceForUpdate.setName(origInstanceForUpdate.getName());
+			
+		}
+		if (StringUtils.isEmpty(resourceInstanceForUpdate.getNormalizedName()))
+			resourceInstanceForUpdate.setNormalizedName(origInstanceForUpdate.getNormalizedName());
+		
+		if (StringUtils.isEmpty(resourceInstanceForUpdate.getIcon()))
+			resourceInstanceForUpdate.setIcon(origInstanceForUpdate.getIcon());		
+	
+		
+		if (StringUtils.isEmpty(resourceInstanceForUpdate.getComponentVersion()))
+			resourceInstanceForUpdate.setComponentVersion(origInstanceForUpdate.getComponentVersion());
+		
+		if (StringUtils.isEmpty(resourceInstanceForUpdate.getComponentName()))
+			resourceInstanceForUpdate.setComponentName(origInstanceForUpdate.getComponentName());
+		
+		if (StringUtils.isEmpty(resourceInstanceForUpdate.getToscaComponentName()))
+				resourceInstanceForUpdate.setToscaComponentName(origInstanceForUpdate.getToscaComponentName());
+		
+		if (resourceInstanceForUpdate.getOriginType() == null) {			
+			resourceInstanceForUpdate.setOriginType(origInstanceForUpdate.getOriginType());
+		}
+		return resourceInstanceForUpdate;
+	}
 }
diff --git a/catalog-be/src/main/resources/config/SDC.zip b/catalog-be/src/main/resources/config/SDC.zip
index 6df1b13f2b..a4ff817216 100644
--- a/catalog-be/src/main/resources/config/SDC.zip
+++ b/catalog-be/src/main/resources/config/SDC.zip
diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
index da15414d9d..621274796f 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -67,7 +67,7 @@ tosca.datatypes.TimeInterval:
 
 tosca.datatypes.network.NetworkInfo:
   derived_from: tosca.datatypes.Root
-  properties:  
+  properties:
     network_name: 
       type: string
     network_id: 
@@ -1045,7 +1045,13 @@ org.openecomp.datatypes.network.IpRequirements:
       required: false
     floating_ip_count_required:
       type: org.openecomp.datatypes.AssignmentRequirements
-      required: false 
+      required: false
+    ip_address_plan_name:
+      type: string
+      required: false
+    vrf_name:
+      type: string
+      required: false
 
 org.openecomp.datatypes.network.MacAssignments:
   derived_from: org.openecomp.datatypes.Root
diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip
index 08d4bfc3a5..ffbe146f9b 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
index 1ef72856a4..5c8e84abe2 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
+++ b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
@@ -1,5 +1,9 @@
 {
   "heat": [
+    "contrailPort",
+    "extCp",
+    "contrailV2VirtualMachineInterface",
+    "neutronPort",
     "Generic_PNF"
   ],
   "normative": [
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py
index 75afe33eba..e35e2d28eb 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py
@@ -107,4 +107,5 @@ def main(argv):
 
 
 if __name__ == "__main__":
-    main(sys.argv[1:])
\ No newline at end of file
+    main(sys.argv[1:])
+
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/HealthCheckBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/HealthCheckBusinessLogicTest.java
index 68d47590f0..be3bf9b234 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/HealthCheckBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/HealthCheckBusinessLogicTest.java
@@ -42,7 +42,6 @@ import fj.data.Either;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-
 public class HealthCheckBusinessLogicTest {
 
 	HealthCheckBusinessLogic healthCheckBusinessLogic = new HealthCheckBusinessLogic();
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 7d10b3f4e1..2627899e1f 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -300,28 +300,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescription.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescription.java
index f7506f77e1..885a7a7ce3 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescription.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/MigrationTasksTableDescription.java
@@ -54,6 +54,7 @@ public class MigrationTasksTableDescription implements ITableDescription {
         NAME("task_name", DataType.varchar(), false),
         STATUS("task_status", DataType.varchar(), false),
         MESSAGE("msg", DataType.varchar(), false),
+        DESCRIPTION("description", DataType.varchar(), false),
         EXECUTION_TIME("execution_time", DataType.cdouble(), false);
 
         private String fieldName;
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntry.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntry.java
index 08376b616f..b64ef201dd 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntry.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/MigrationTaskEntry.java
@@ -34,6 +34,9 @@ public class MigrationTaskEntry {
     @Column(name = "msg")
     private String message;
 
+    @Column(name = "description")
+    private String description;
+
     public void setMajorVersion(Long majorVersion) {
         this.majorVersion = majorVersion;
     }
@@ -89,4 +92,12 @@ public class MigrationTaskEntry {
     public double getExecutionTime() {
         return executionTime;
     }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 4883978261..155b14c486 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -446,64 +446,5 @@
             	<finalName>${project.artifactId}-${project.version}</finalName>          
             </build>
         </profile>
-        
-        <profile>
-            <id>build</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-
-            <build>
-                <finalName>${project.artifactId}-${full.release.version}</finalName>
-                
-                <plugins>
-                    <!-- ================================================== -->
-                    <!-- Get the next versions from the properties file. -->
-                    <!-- ================================================== -->
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <version>1.0-alpha-2</version>
-
-                        <executions>
-                            <execution>
-                                <inherited>false</inherited>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>read-project-properties</goal>
-                                </goals>
-                                <configuration>
-                                    <files>
-                                        <file>${project.parent.build.directory}/FullReleaseVersion.properties</file>
-                                    </files>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/GzipFilter.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/GzipFilter.java
new file mode 100644
index 0000000000..884e688503
--- /dev/null
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/GzipFilter.java
@@ -0,0 +1,40 @@
+package org.openecomp.sdc.fe;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+public class GzipFilter implements Filter {
+
+    @Override
+    public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
+            throws IOException,
+            ServletException {
+
+      
+        final HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+
+        httpResponse.setHeader("Content-Encoding", "gzip");
+        httpResponse.setHeader("Content-Type", "application/javascript");
+        chain.doFilter(request, response);
+    }
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void destroy() {
+		// TODO Auto-generated method stub
+		
+	}
+}
\ No newline at end of file
diff --git a/catalog-fe/src/main/webapp/WEB-INF/web.xml b/catalog-fe/src/main/webapp/WEB-INF/web.xml
index 9c81055652..725c041c51 100644
--- a/catalog-fe/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-fe/src/main/webapp/WEB-INF/web.xml
@@ -105,6 +105,17 @@
 	</filter-mapping>
 
 
+
+	 <filter>
+	   <filter-name>gzipFilter</filter-name>
+	   <filter-class>org.openecomp.sdc.fe.GzipFilter</filter-class>
+	 </filter>
+	
+	 <filter-mapping>
+	   <filter-name>gzipFilter</filter-name>
+	   <url-pattern>*.jsgz</url-pattern>
+	 </filter-mapping>
+
 	<listener>
 		<listener-class>org.openecomp.sdc.fe.listen.FEAppContextListener</listener-class>
 	</listener>
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index ef485ae870..444686d3a2 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -249,27 +249,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java
index 64424a8070..45a1f2bd31 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java
@@ -2115,10 +2115,12 @@ public class ToscaOperationFacade {
             CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to delete group instances for container {}. error {] ", componentInstanceId, status);
             return Either.right(status);
         }
-        status = addGroupInstancesToComponentInstance( containerComponent , componentInstance, componentInstance.getGroupInstances() );
-        if (status != StorageOperationStatus.OK && status != StorageOperationStatus.NOT_FOUND) {
-            CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to add group instances for container {}. error {] ", componentInstanceId, status);
-            return Either.right(status);
+        if(componentInstance.getGroupInstances() != null){
+        	status = addGroupInstancesToComponentInstance( containerComponent , componentInstance, componentInstance.getGroupInstances() );
+        	if (status != StorageOperationStatus.OK && status != StorageOperationStatus.NOT_FOUND) {
+        		CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to add group instances for container {}. error {] ", componentInstanceId, status);
+        		return Either.right(status);
+        	}
         }
         return Either.left(status);
     }
diff --git a/catalog-ui/karma.conf.js b/catalog-ui/karma.conf.js
deleted file mode 100644
index 1f2613a346..0000000000
--- a/catalog-ui/karma.conf.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/0.13/config/configuration-file.html
-
-module.exports = function (config) {
-  config.set({
-    basePath: '',
-    frameworks: ['jasmine', 'angular-cli'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-remap-istanbul'),
-      require('angular-cli/plugins/karma')
-    ],
-    files: [
-      { pattern: './src/test.ts', watched: false }
-    ],
-    preprocessors: {
-      './src/test.ts': ['angular-cli']
-    },
-    mime: {
-      'text/x-typescript': ['ts','tsx']
-    },
-    remapIstanbulReporter: {
-      reports: {
-        html: 'coverage',
-        lcovonly: './coverage/coverage.lcov'
-      }
-    },
-    angularCli: {
-      config: './angular-cli.json',
-      environment: 'dev'
-    },
-    reporters: config.angularCli && config.angularCli.codeCoverage
-              ? ['progress', 'karma-remap-istanbul']
-              : ['progress'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false
-  });
-};
diff --git a/catalog-ui/package.json b/catalog-ui/package.json
index 4fd1f46734..6e86b46dd0 100644
--- a/catalog-ui/package.json
+++ b/catalog-ui/package.json
@@ -17,18 +17,17 @@
     "start": "webpack-dev-server",
     "build": "webpack --config webpack.config.js",
     "build:prod": "webpack --config webpack.production.js",
-    "test": "karma start ./karma.conf.js",
     "lint": "ng lint",
-    "e2e": "protractor ./protractor.conf.js",
     "pree2e": "webdriver-manager update --standalone false --gecko false --quiet"
   },
   "devDependencies": {
+    "@angular/compiler": "^2.4.8",
+    "@angular/compiler-cli": "^2.4.8",
     "apache-server-configs": "^2.7.1",
     "autoprefixer": "^6.5.3",
     "copy-webpack-plugin": "^4.0.1",
     "cors": "2.7.1",
     "css-loader": "^0.26.1",
-    "cssnano": "^3.10.0",
     "exports-loader": "^0.6.3",
     "express": "^4.14.0",
     "extract-text-webpack-plugin": "^2.1.0",
@@ -36,24 +35,11 @@
     "html-loader": "^0.4.5",
     "html-webpack-plugin": "^2.28.0",
     "http-proxy-middleware": "^0.14.0",
-    "istanbul-instrumenter-loader": "^2.0.0",
-    "jasmine-core": "2.5.2",
     "jshint-stylish": "2.2.1",
     "json-loader": "^0.5.4",
-    "karma": "1.4.0",
-    "karma-chrome-launcher": "0.2.2",
-    "karma-coverage": "1.1.1",
-    "karma-jasmine": "1.1.0",
-    "karma-junit-reporter": "0.3.8",
-    "karma-mocha-reporter": "2.2.2",
-    "karma-ng-html2js-preprocessor": "1.0.0",
-    "karma-ng-scenario": "1.0.0",
-    "karma-phantomjs-launcher": "0.2.1",
-    "karma-sourcemap-loader": "^0.3.7",
     "less": "^2.7.2",
     "less-loader": "^2.2.3",
     "load-grunt-tasks": "3.5.2",
-    "phantomjs": "2.1.7",
     "postcss-loader": "^0.13.0",
     "postcss-url": "^5.1.2",
     "raw-loader": "^0.5.1",
@@ -61,8 +47,6 @@
     "script-loader": "^0.7.0",
     "source-map-loader": "^0.1.5",
     "style-loader": "^0.13.1",
-    "stylus-loader": "^2.4.0",
-    "time-grunt": "1.4.0",
     "url-loader": "^0.5.7",
     "webpack-dev-middleware": "^1.10.1",
     "webpack-dev-server": "~2.3.0"
@@ -73,8 +57,6 @@
   "dependencies": {
     "@angular/cli": "^1.0.0-rc.1",
     "@angular/common": "^2.4.8",
-    "@angular/compiler": "^2.4.8",
-    "@angular/compiler-cli": "^2.4.8",
     "@angular/core": "^2.4.8",
     "@angular/forms": "^2.4.8",
     "@angular/http": "^2.4.8",
@@ -113,17 +95,15 @@
     "checklist-model": "^0.11.0",
     "class-transformer": "^0.1.6",
     "clean-webpack-plugin": "^0.1.16",
-    "codelyzer": "^2.0.1",
+    "compression": "^1.6.2",
+    "compression-webpack-plugin": "^0.4.0",
     "core-js": "^2.4.1",
     "cytoscape": "^2.7.15",
     "cytoscape.js-undo-redo": "^1.0.1",
-    "express": "4.14.0",
     "jquery": "^2.2.4",
     "jqueryui": "^1.11.1",
     "js-md5": "^0.4.2",
     "lodash": "^4.17.2",
-    "multer": "1.2.1",
-    "ng-html2js": "2.0.0",
     "ng-infinite-scroll": "^1.3.0",
     "ng2-interceptors": "^1.3.0-1",
     "perfect-scrollbar": "^0.6.16",
@@ -132,13 +112,11 @@
     "restangular": "^1.6.1",
     "rxjs": "^5.2.0",
     "sdc-angular-dragdrop": "^1.0.14",
-    "ts-helpers": "^1.1.2",
-    "ts-node": "^2.1.0",
-    "tslint": "^4.4.2",
     "typescript": "2.3.4",
     "typings": "^2.1.0",
     "underscore": "^1.8.3",
     "webpack": "^2.2.1",
+    "webpack-bundle-analyzer": "^2.8.2",
     "webpack-dev-server": "^2.4.1",
     "webpack-merge": "^4.0.0",
     "zone.js": "^0.7.7"
diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index 737ed33a41..80d534c669 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -254,28 +254,6 @@
 		</profile>
 
 
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
         <profile>
             <id>not-minified</id>
             <activation>
diff --git a/catalog-ui/protractor.conf.js b/catalog-ui/protractor.conf.js
deleted file mode 100644
index ffded70180..0000000000
--- a/catalog-ui/protractor.conf.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-
-/*global jasmine */
-var SpecReporter = require('jasmine-spec-reporter');
-
-exports.config = {
-  allScriptsTimeout: 11000,
-  specs: [
-    './e2e/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    'browserName': 'chrome'
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function() {}
-  },
-  useAllAngular2AppRoots: true,
-  beforeLaunch: function() {
-    require('ts-node').register({
-      project: 'e2e'
-    });
-  },
-  onPrepare: function() {
-    jasmine.getEnv().addReporter(new SpecReporter());
-  }
-};
diff --git a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts
index 6d4e6d3c68..37b9b9db9c 100644
--- a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts
+++ b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view-model.ts
@@ -48,6 +48,7 @@ export interface IOnboardVendorViewModelScope extends ng.IScope {
     topNavRootMenu:MenuItemGroup;
     user:IUserProperties;
     version:string;
+    isLoading: boolean;
 }
 
 export class OnboardVendorViewModel {
@@ -63,6 +64,12 @@ export class OnboardVendorViewModel {
                 private $q:ng.IQService,
                 private cacheService:CacheService) {
 
+        this.$scope.isLoading = true;
+
+        $.getScript("/onboarding/punch-outs_en.js", () => {
+            this.$scope.isLoading = false;
+        });
+
         this.$scope.vendorData = {
             breadcrumbs: {
                 selectedKeys: []
diff --git a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html
index 734fb93daf..56a36863e1 100644
--- a/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html
+++ b/catalog-ui/src/app/view-models/onboard-vendor/onboard-vendor-view.html
@@ -1,10 +1,6 @@
 <div class="sdc-catalog-container">
 
-    <loader data-display="gui.isLoading"></loader>
-<!--
-    <ecomp-header menu-data="menuItems" version="{{version}}"></ecomp-header>
--->
-
+    <loader ng-init="isLoading=true" data-display="isLoading"></loader>
     <div class="w-sdc-main-container">
         <punch-out name="'onboarding/vendor'" data="vendorData"  user="user" on-event="onVendorEvent"></punch-out>
     </div>
diff --git a/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts b/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts
index ec8b04dbdb..f529e79fa7 100644
--- a/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/workspace-view-model.ts
@@ -636,7 +636,7 @@ export class WorkspaceViewModel {
         this.$scope.reload = (component:Component):void => {
             this.$state.go(this.$state.current.name,{id:component.uniqueId},{reload:true});
         };
-        
+
     };
 
     private initAfterScope = ():void => {
diff --git a/catalog-ui/src/assets/styles/images/welcome/002.png b/catalog-ui/src/assets/styles/images/welcome/002.png
index e76c480ad8..d4fdae694a 100644
--- a/catalog-ui/src/assets/styles/images/welcome/002.png
+++ b/catalog-ui/src/assets/styles/images/welcome/002.png
diff --git a/catalog-ui/src/index.html b/catalog-ui/src/index.html
index c41532e01c..3a66d4da45 100644
--- a/catalog-ui/src/index.html
+++ b/catalog-ui/src/index.html
@@ -1,26 +1,29 @@
 <!doctype html>
 <html>
 <head>
-  <meta charset="utf-8">
-  <title>SDC</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+    <meta charset="utf-8">
+    <title>SDC</title>
+    <base href="/">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <link rel="icon" type="image/x-icon" href="favicon.ico">
+
 </head>
 <body data-ng-class="bodyClass">
 
-  <!--<h1>Index.html</h1>-->
-  <app-root>Loading...</app-root>
-  <!--<h2>Before ui-view</h2>-->
-  <div ui-view style="height:100%"></div>
-  <!--<h2>After ui-view</h2>-->
-  <script type="text/javascript" src="/sdc1/scripts/inline.bundle.js"></script>
-  <script type="text/javascript" src="/sdc1/scripts/polyfills.bundle.js"></script>
-  <script type="text/javascript" src="/sdc1/scripts/vendor.bundle.js"></script>
-  <script type="text/javascript" src="/dcae/dcae-bundle.js"></script>
-  <script type="text/javascript" src="/sdc1/scripts/main.bundle.js"></script>
-  <script type="text/javascript" src="/sdc1/scripts/styles.bundle.js"></script></body>
-  <script type="text/javascript" src="/onboarding/punch-outs_en.js" async></script>
+<!--<h1>Index.html</h1>-->
+<app-root>Loading...</app-root>
+<!--<h2>Before ui-view</h2>-->
+<div ui-view style="height:100%"></div>
+<!--<h2>After ui-view</h2>-->
+<script src="/sdc1/scripts/inline.bundle.js"></script>
+<script src="/sdc1/scripts/polyfills.bundle.js"></script>
+<script src="/sdc1/scripts/vendor.bundle.js"></script>
+<script src="/dcae/dcae-bundle.js" async></script>
+<script id="main-bundle" src="/sdc1/scripts/main.bundle.js"></script>
+<script src="/sdc1/scripts/styles.bundle.js"></script>
+
+</body>
 
 </html>
+
diff --git a/catalog-ui/src/main.ts b/catalog-ui/src/main.ts
index 20e4352901..9d25a34169 100644
--- a/catalog-ui/src/main.ts
+++ b/catalog-ui/src/main.ts
@@ -38,10 +38,10 @@ if (__ENV__==='prod') {
 
 // Ugliy fix because the cookie recieved from webseal change his value after some seconds.
 declare var __ENV__: string;
-let timeout:number = 5000;
+let timeout:number = 0;
 if (__ENV__==='dev'){
     timeout=0;
-} 
+}
 window.setTimeout(()=>{
     platformBrowserDynamic().bootstrapModule(AppModule).then(platformRef => {
         const upgrade = platformRef.injector.get(UpgradeModule) as UpgradeModule;
diff --git a/catalog-ui/webpack.common.js b/catalog-ui/webpack.common.js
index fc2f5a4387..4482d0e014 100644
--- a/catalog-ui/webpack.common.js
+++ b/catalog-ui/webpack.common.js
@@ -9,7 +9,7 @@ const postcssUrl = require('postcss-url');
 const {GlobCopyWebpackPlugin, BaseHrefWebpackPlugin} = require('@angular/cli/plugins/webpack');
 const {CommonsChunkPlugin} = require('webpack').optimize;
 const {AotPlugin} = require('@ngtools/webpack');
-
+var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const nodeModules = path.join(process.cwd(), 'node_modules');
 
 const bundledScripts = [
@@ -196,6 +196,7 @@ module.exports = function(params) {
             }),
             new webpack.NoEmitOnErrorsPlugin(),
             new ProgressPlugin(),
+            // new BundleAnalyzerPlugin(),
             // new HtmlWebpackPlugin({
             //     template: "./src/index.html",
             //     filename: "./index.html",
diff --git a/catalog-ui/webpack.production.js b/catalog-ui/webpack.production.js
index db33a94f3e..a593e37119 100644
--- a/catalog-ui/webpack.production.js
+++ b/catalog-ui/webpack.production.js
@@ -7,20 +7,10 @@ const ServerConfig = require('./webpack.server');
 const webpackCommonConfig = require('./webpack.common');
 const {GlobCopyWebpackPlugin, BaseHrefWebpackPlugin} = require('@angular/cli/plugins/webpack');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-
+var CompressionPlugin = require('compression-webpack-plugin');
 var currentTime = new Date().getTime();
 
-const params = {
-    // entryPoints: [
-    //     '/sdc1/scripts/inline',
-    //     '/sdc1/scripts/polyfills',
-    //     '/sdc1/scripts/vendor',
-    //     '/sdc1/scripts/main',
-    //     '/sdc1/scripts/sw-register',
-    //     '/sdc1/scripts/scripts',
-    //     '/sdc1/scripts/styles'
-    // ]
-};
+const params = {};
 
 const webpackProdConfig = {
     module: {
@@ -29,7 +19,7 @@ const webpackProdConfig = {
             {
                 test: /\.(jpg|png|gif|otf|ttf|woff|woff2|cur|ani)$/,
                 loader: "url-loader?name=/scripts/images/[name].[hash:20].[ext]&limit=10000"
-            }
+    }
         ]
     },
     output: {
@@ -47,9 +37,10 @@ const webpackProdConfig = {
         new CopyWebpackPlugin([
             {
                 from: './src/index.html', transform: function (content, path) {
-                    content = (content + '').replace(/\.bundle/g, '.' + currentTime + '.bundle');
-                    return content;
-                }
+                content = (content + '').replace(/\.bundle.js/g, '.' + currentTime + '.bundle.jsgz');
+
+                return content;
+            }
             }
         ]),
         new webpack.optimize.UglifyJsPlugin({
@@ -63,6 +54,12 @@ const webpackProdConfig = {
                 screw_ie8: true
             },
             comments: false
+        }),
+        new webpack.optimize.AggressiveMergingPlugin(),//Merge chunks
+        new CompressionPlugin({
+            asset: "[path]gz",
+            algorithm: "gzip",
+            test: /\.js$|\.css$|\.html$/
         })
     ]
 };
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 388cf45b34..70ddd5cfee 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -226,28 +226,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/common-be/pom.xml b/common-be/pom.xml
index cafe1485d2..09796654ed 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -113,28 +113,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
index b9eb4e4c9f..2fc84bd8f2 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
@@ -22,8 +22,10 @@ package org.openecomp.sdc.be.datatypes.elements;
 
 import java.io.Serializable;
 
+import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.util.ValidationUtils;
 
 public class ComponentInstanceDataDefinition extends ToscaDataDefinition implements Serializable {
@@ -34,218 +36,201 @@ public class ComponentInstanceDataDefinition extends ToscaDataDefinition impleme
 	
 	private static final long serialVersionUID = 7215033872921497743L;
 
-	private String icon;
-	
-	private String uniqueId;
-
-	private String name;
-	
-	private String normalizedName;
-
-	private String componentUid;
-
-	private Long creationTime;
 
-	private Long modificationTime;
-
-	private String description;
-
-	private String posX;
-
-	private String posY;
-	private Integer propertyValueCounter = 1;
-	private Integer attributeValueCounter;
-	private Integer inputValueCounter = 1;
-	private OriginTypeEnum originType;
-	private String customizationUUID;
-	private String componentName;
-	private String componentVersion;
-	private String toscaComponentName;
-	private String invariantName;
 	
 	public ComponentInstanceDataDefinition() {
 		super();
+		setPropertyValueCounter(1);
+		setAttributeValueCounter(1);
+		setInputValueCounter(1);
 	}
 
 	public ComponentInstanceDataDefinition(ComponentInstanceDataDefinition dataDefinition) {
-		this.icon = dataDefinition.icon;
-		this.uniqueId = dataDefinition.uniqueId;
-		this.name = dataDefinition.name;
-		this.componentUid = dataDefinition.componentUid;
-		this.creationTime = dataDefinition.creationTime;
-		this.modificationTime = dataDefinition.modificationTime;
-		this.description = dataDefinition.description;
-		this.posX = dataDefinition.posX;
-		this.posY = dataDefinition.posY;
-		this.propertyValueCounter = dataDefinition.propertyValueCounter;
-		this.normalizedName = dataDefinition.normalizedName;
-		this.originType = dataDefinition.originType;
-		this.customizationUUID = dataDefinition.customizationUUID;
-		this.componentName = dataDefinition.componentName;
-		this.componentVersion = dataDefinition.componentVersion;
-		this.toscaComponentName = dataDefinition.toscaComponentName;
-		this.invariantName = dataDefinition.invariantName;
+		setIcon(dataDefinition.getIcon());
+		setUniqueId(dataDefinition.getUniqueId());
+		setName(dataDefinition.getName());
+		setComponentUid(dataDefinition.getComponentUid());
+		setCreationTime(dataDefinition.getCreationTime());
+		setModificationTime(dataDefinition.getModificationTime());
+		setDescription(dataDefinition.getDescription());
+		setPosX(dataDefinition.getPosX());
+		setPosY(dataDefinition.getPosY());
+		setPropertyValueCounter(dataDefinition.getPropertyValueCounter());
+		setNormalizedName(dataDefinition.getNormalizedName());
+		setOriginType(dataDefinition.getOriginType());
+		setCustomizationUUID(dataDefinition.getCustomizationUUID());
+		setComponentName( dataDefinition.getComponentName());
+		setComponentVersion(dataDefinition.getComponentVersion());
+		setToscaComponentName(dataDefinition.getToscaComponentName());
+		setInvariantName( dataDefinition.getInvariantName());
 	}
 	
 	public String getIcon() {
-		return icon;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CI_ICON);
 	}
 
 	public void setIcon(String icon) {
-		this.icon = icon;
+		setToscaPresentationValue(JsonPresentationFields.CI_ICON, icon);
 	}
 	public String getUniqueId() {
-		return uniqueId;
+		return (String) getToscaPresentationValue(JsonPresentationFields.UNIQUE_ID);
 	}
 
 	public void setUniqueId(String uniqueId) {
-		this.uniqueId = uniqueId;
+		setToscaPresentationValue(JsonPresentationFields.UNIQUE_ID, uniqueId);
 	}
 
 	public Long getCreationTime() {
-		return creationTime;
+		return (Long) getToscaPresentationValue(JsonPresentationFields.CREATION_TIME);
 	}
 
 	public void setCreationTime(Long creationTime) {
-		this.creationTime = creationTime;
+		setToscaPresentationValue(JsonPresentationFields.CREATION_TIME, creationTime);
 	}
 
 	public Long getModificationTime() {
-		return modificationTime;
+		return (Long) getToscaPresentationValue(JsonPresentationFields.MODIFICATION_TIME);
 	}
 
 	public void setModificationTime(Long modificationTime) {
-		this.modificationTime = modificationTime;
+		setToscaPresentationValue(JsonPresentationFields.MODIFICATION_TIME, modificationTime);
 	}
 
 	public String getDescription() {
-		return description;
+		return (String) getToscaPresentationValue(JsonPresentationFields.DESCRIPTION);
 	}
 
 	public void setDescription(String description) {
-		this.description = description;
+		setToscaPresentationValue(JsonPresentationFields.DESCRIPTION, description);
 	}
 
 	public String getPosX() {
-		return posX;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CI_POS_X);
 	}
 
 	public void setPosX(String posX) {
-		this.posX = posX;
+		setToscaPresentationValue(JsonPresentationFields.CI_POS_X, posX);
 	}
 
 	public String getPosY() {
-		return posY;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CI_POS_Y);
 	}
 
 	public void setPosY(String posY) {
-		this.posY = posY;
+		setToscaPresentationValue(JsonPresentationFields.CI_POS_Y, posY);
 	}
 
 	public String getComponentUid() {
-		return componentUid;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_UID);
 	}
 
 	public void setComponentUid(String resourceUid) {
-		this.componentUid = resourceUid;
+		setToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_UID, resourceUid);
 	}
 
 	public String getName() {
-		return name;
+		return (String) getToscaPresentationValue(JsonPresentationFields.NAME);
 	}
 
 	public void setName(String name) {
-		if(invariantName == null){
-			invariantName = ValidationUtils.normalizeComponentInstanceName(name);
+		if(this.getInvariantName() == null){
+			this.setInvariantName(ValidationUtils.normalizeComponentInstanceName(name));
 		}
-		this.name = name;
+		setToscaPresentationValue(JsonPresentationFields.NAME, name);
 	}
 	
 	public String getInvariantName() {
-		return invariantName;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CI_INVARIANT_NAME);
 	}
 
 	public void setInvariantName(String invariantName) {
-		this.invariantName = invariantName;
+		setToscaPresentationValue(JsonPresentationFields.CI_INVARIANT_NAME, invariantName);
 	}
 
 	public Integer getPropertyValueCounter() {
-		return propertyValueCounter;
+		return (Integer) getToscaPresentationValue(JsonPresentationFields.CI_PROP_VALUE_COUNTER);
 	}
 
 	public void setPropertyValueCounter(Integer propertyValueCounter) {
-		this.propertyValueCounter = propertyValueCounter;
+		setToscaPresentationValue(JsonPresentationFields.CI_PROP_VALUE_COUNTER, propertyValueCounter);
 	}
 
 	public String getNormalizedName() {
-		return normalizedName;
+		return (String) getToscaPresentationValue(JsonPresentationFields.NORMALIZED_NAME);
 	}
 
 	public void setNormalizedName(String normalizedName) {
-		this.normalizedName = normalizedName;
+		setToscaPresentationValue(JsonPresentationFields.NORMALIZED_NAME, normalizedName);
 	}
 
 	public OriginTypeEnum getOriginType() {
+		OriginTypeEnum originType = null;
+		String origType = (String) getToscaPresentationValue(JsonPresentationFields.CI_ORIGIN_TYPE);	
+		if (origType != null && !origType.isEmpty()) {
+
+			originType = OriginTypeEnum.findByValue(origType);
+		}
 		return originType;
 	}
 
 	public void setOriginType(OriginTypeEnum originType) {
-		this.originType = originType;
+		if(originType != null)
+			setToscaPresentationValue(JsonPresentationFields.CI_ORIGIN_TYPE, originType.getValue());
 	}
 
 	public Integer getAttributeValueCounter() {
-		return attributeValueCounter;
+		return (Integer) getToscaPresentationValue(JsonPresentationFields.CI_ATTR_VALUE_COUNTER);
 	}
 
 	public void setAttributeValueCounter(Integer attributeValueCounter) {
-		this.attributeValueCounter = attributeValueCounter;
+		setToscaPresentationValue(JsonPresentationFields.CI_ATTR_VALUE_COUNTER, attributeValueCounter);
 	}
 
 	public Integer getInputValueCounter() {
-		return inputValueCounter;
+		return (Integer) getToscaPresentationValue(JsonPresentationFields.CI_INPUT_VALUE_COUNTER);
 	}
 
 	public void setInputValueCounter(Integer inputValueCounter) {
-		this.inputValueCounter = inputValueCounter;
+		setToscaPresentationValue(JsonPresentationFields.CI_INPUT_VALUE_COUNTER, inputValueCounter);
 	}
 
 	public String getCustomizationUUID() {
-		return customizationUUID;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CUSTOMIZATION_UUID);
 	}
 
 	public void setCustomizationUUID(String customizationUUID) {
-		this.customizationUUID = customizationUUID;
+		setToscaPresentationValue(JsonPresentationFields.CUSTOMIZATION_UUID, customizationUUID);
 	}
 
 	public String getComponentName() {
-		return componentName;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_NAME);
 	}
 
 	public void setComponentName(String resourceName) {
-		this.componentName = resourceName;
+		setToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_NAME, resourceName);
 	}
 
 	public String getComponentVersion() {
-		return componentVersion;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_VERSION);
 	}
 
 	public String getToscaComponentName() {
-		return toscaComponentName;
+		return (String) getToscaPresentationValue(JsonPresentationFields.CI_TOSCA_COMPONENT_NAME);
 	}
 
 	public void setToscaComponentName(String toscaComponentName) {
-		this.toscaComponentName = toscaComponentName;
+		setToscaPresentationValue(JsonPresentationFields.CI_TOSCA_COMPONENT_NAME, toscaComponentName);
 	}
 
 	public void setComponentVersion(String resourceVersion) {
-		this.componentVersion = resourceVersion;
+		setToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_VERSION, resourceVersion);
 	}
 
 	@Override
 	public String toString() {
-		return "ComponentInstanceDataDefinition [icon=" + icon + ", uniqueId=" + uniqueId + ", name=" + name + ", normalizedName=" + normalizedName + ", componentUid=" + componentUid + ", creationTime=" + creationTime + ", modificationTime="
-				+ modificationTime + ", description=" + description + ", posX=" + posX + ", posY=" + posY + ", propertyValueCounter=" + propertyValueCounter + ", attributeValueCounter=" + attributeValueCounter + ", inputValueCounter="
-				+ inputValueCounter + ", originType=" + originType + ", customizationUUID=" + customizationUUID + ", componentName=" + componentName + ", componentVersion=" + componentVersion + ", toscaComponentName=" + toscaComponentName + "]";
+		return "ComponentInstanceDataDefinition [icon=" + getIcon() + ", uniqueId=" + getUniqueId() + ", name=" + getName() + ", normalizedName=" + getNormalizedName() + ", componentUid=" + getComponentUid() + ", creationTime=" + getCreationTime() + ", modificationTime="
+				+ getModificationTime() + ", description=" + getDescription() + ", posX=" + getPosX() + ", posY=" + getPosY() + ", propertyValueCounter=" + getPropertyValueCounter() + ", attributeValueCounter=" + getAttributeValueCounter() + ", inputValueCounter="
+				+ getInputValueCounter() + ", originType=" + getOriginType() + ", customizationUUID=" + getCustomizationUUID() + ", componentName=" + getComponentName() + ", componentVersion=" + getComponentVersion() + ", toscaComponentName=" + getToscaComponentName() + "]";
 	}
 
 }
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
index d5592995e6..fd028c0349 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
@@ -159,6 +159,21 @@ public enum JsonPresentationFields {
 	GROUP_INSTANCE_ARTIFACTS		("groupInstanceArtifacts",		null),
 	GROUP_INSTANCE_ARTIFACTS_UUID	("groupInstanceArtifactsUuid",	null),
 	GROUP_INSTANCE_PROPERTIES		("groupInstancesProperties",	null),
+	
+	//Component insatnce
+
+	CI_COMPONENT_UID 				("componentUid", null),
+	CI_POS_X 						("posX", null),
+	CI_POS_Y 						("posY", null),	
+	CI_PROP_VALUE_COUNTER 			("propertyValueCounter", null),
+	CI_ATTR_VALUE_COUNTER			("attributeValueCounter", null),
+	CI_INPUT_VALUE_COUNTER 			("inputValueCounter", null),
+	CI_ORIGIN_TYPE 					("originType", null),
+	CI_COMPONENT_NAME 				("componentName", null),
+	CI_COMPONENT_VERSION 			("componentVersion", null),
+	CI_TOSCA_COMPONENT_NAME 		("toscaComponentName", null),
+	CI_INVARIANT_NAME 				("invariantName", null),
+	CI_ICON 						("icon", null),
 
 	;
 	
diff --git a/pom.xml b/pom.xml
index dcb086ce71..6941b6e1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 		<!-- ==================== -->
 		<!-- Generic properties -->
 		<!-- ==================== -->
-		<build.type>-SNAPSHOT</build.type>
+		<build.type></build.type>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sprint.number>74</sprint.number>
 
@@ -60,13 +60,13 @@
         <commons-logging>1.2</commons-logging>
 		<groovy.version>2.3.5</groovy.version>
 		<janino.version>3.0.6</janino.version>
-		
+
 		<!-- aspects -->
 		<jcabi.version>0.20.1</jcabi.version>
 		<aspectjrt.version>1.8.4</aspectjrt.version>
 		<aspectj.version>1.7.4</aspectj.version>
 		<jcabi.plugin.version>0.13.2</jcabi.plugin.version>
-		
+
 		<!-- Logging end -->
 		<!-- System Metrics -->
 		<sigar.version>1.6.4</sigar.version>
@@ -295,7 +295,8 @@
 					<sectionDelimiter>================================================================================</sectionDelimiter>
 					<licenseName>apache_v2</licenseName>
 					<inceptionYear>2017</inceptionYear>
-					<organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
+					<organizationName>AT&amp;T Intellectual Property. All rights
+						reserved.</organizationName>
 					<projectName>SDC</projectName>
 					<canUpdateCopyright>true</canUpdateCopyright>
 					<canUpdateDescription>true</canUpdateDescription>
@@ -379,97 +380,16 @@
 			
 			<properties>
 				<ecomp.version>1.2.7</ecomp.version>
-				<artifact-generator-api.version>1707.0.0</artifact-generator-api.version>
-				<artifact-generator-core.version>1707.0.0</artifact-generator-core.version>
-				<dox-common-lib.version>1707.0.0</dox-common-lib.version>
+				<artifact-generator-api.version>1710.0.0-SNAPSHOT</artifact-generator-api.version>
+				<artifact-generator-core.version>1710.0.0-SNAPSHOT</artifact-generator-core.version>
+				<dox-common-lib.version>1710.0.0-SNAPSHOT</dox-common-lib.version>
 				<sdc-tosca-parser.version>1.1.14</sdc-tosca-parser.version>
 			</properties>	
 			
 			
 		</profile>
 		
-		<profile>
-			<id>build</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<modules>
-				<module>security-utils</module>
-				<module>common-app-api</module>
-				<module>common-be</module>
-				<module>catalog-dao</module>
-				<module>catalog-model</module>
-				<module>catalog-be</module>
-				<module>asdctool</module>
-				<module>catalog-ui</module>
-				<module>catalog-fe</module>
-				<module>asdc-tests</module>
-				<module>test-apis-ci</module>
-				<module>ui-ci</module>
-			</modules>
-			
-			
-			<properties>
-				<ecomp.version>1.2.7</ecomp.version>
-				<artifact-generator-api.version>1707.0.0</artifact-generator-api.version>
-				<artifact-generator-core.version>1707.0.0</artifact-generator-core.version>
-				<dox-common-lib.version>1707.0.0</dox-common-lib.version>
-				<sdc-tosca-parser.version>1.1.14</sdc-tosca-parser.version>
-			</properties>
-		
-			<build>
-				<plugins>
-					<!-- Create the 'next build number' file -->
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.5.0</version>
-						
-						<executions>
-							<execution>
-								<inherited>false</inherited>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<phase>initialize</phase>
-								<id>get.next.build.number</id>
-								<configuration>
-									<workingDirectory>${project.basedir}</workingDirectory>
-									<executable>/usr/bin/perl</executable>
-									<arguments>
-										<argument>scripts/get_next_version.pl</argument>
-										<argument>-groupId=${project.groupId}</argument>
-										<argument>-artifactId=${project.artifactId}</argument>
-										<argument>-baseVersion=${project.version}.${sprint.number}</argument>
-									</arguments>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>properties-maven-plugin</artifactId>
-						<version>1.0-alpha-2</version>
-
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<inherited>false</inherited>
-								<goals>
-									<goal>read-project-properties</goal>
-								</goals>
-								<configuration>
-									<files>
-										<file>${project.build.directory}/FullReleaseVersion.properties</file>
-									</files>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
+
 
 		<profile>
 			<id>onboarding</id>
@@ -480,50 +400,6 @@
 				<module>onboarding</module>
 			</modules>
 		</profile>
-
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.artifactId}</buildId>
-							<toplevelArtifactId>${project.artifactId}</toplevelArtifactId>
-							<fortify.sca.exclude>**/node_modules/*</fortify.sca.exclude>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<profile>
-			<id>WhiteSource</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.whitesource</groupId>
-						<artifactId>whitesource-maven-plugin</artifactId>
-						<version>3.1.6</version>
-						<configuration>
-							<orgToken>2809bf29-b00c-48c0-a1f0-ca5c9c22f3df</orgToken>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
 	</profiles>
 
 	<repositories>
@@ -549,11 +425,6 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-<!--		<repository>
-			<id>central</id>
-			<name>Official Maven repository</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>-->
 		<repository>
 			<id>ecomp-releases</id>
 			<name>Release Repository</name>
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index 60f1d98415..cbecfdbbe9 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -267,7 +267,7 @@ serviceApiArtifacts:
 additionalInformationMaxNumberOfKeys: 50
 
 systemMonitoring:
-    enabled: true
+    enabled: false
     isProxy: false
     probeIntervalInSeconds: 15
 defaultHeatArtifactTimeoutMinutes: 60
@@ -557,9 +557,9 @@ applicationL1Cache:
         pollIntervalInSec: 60
 
 applicationL2Cache:
-    enabled: true
+    enabled: false
     catalogL1Cache:
-        enabled: true
+        enabled: false
         resourcesSizeInCache: 300
         servicesSizeInCache: 200
         productsSizeInCache: 100
diff --git a/security-utils/pom.xml b/security-utils/pom.xml
index c98a6ba11c..3e3c9fad76 100644
--- a/security-utils/pom.xml
+++ b/security-utils/pom.xml
@@ -21,35 +21,4 @@
 		</dependency>
 	</dependencies>
 
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-deploy-plugin</artifactId>
-						<version>2.7</version>
-						<configuration>
-							<skip>true</skip>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index 80297c570e..0059e23de1 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -353,29 +353,5 @@
 		</plugins>
 	</build>
 
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<!-- =========================== -->
-					<!-- HP Fortifay scanner -->
-					<!-- =========================== -->
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<scanEnabled>false</scanEnabled>
-							<skip>true</skip>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+
 </project>
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index 072a610360..06e3be24ff 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -262,33 +262,6 @@
 
 	<build>
 		<plugins>
-
-			<!-- ================================================== -->
-			<!-- Get the next versions from the properties file. -->
-			<!-- ================================================== -->
-			<!--<plugin>-->
-				<!--<groupId>org.codehaus.mojo</groupId>-->
-				<!--<artifactId>properties-maven-plugin</artifactId>-->
-				<!--<version>1.0-alpha-1</version>-->
-				<!--<inherited>false</inherited>-->
-
-				<!--<executions>-->
-					<!--<execution>-->
-						<!--<id>ui-ci</id>-->
-						<!--<phase>initialize</phase>-->
-						<!--<goals>-->
-							<!--<goal>read-project-properties</goal>-->
-						<!--</goals>-->
-
-						<!--<configuration>-->
-							<!--<files>-->
-								<!--<file>../target/FullReleaseVersion.properties</file>-->
-							<!--</files>-->
-						<!--</configuration>-->
-					<!--</execution>-->
-				<!--</executions>-->
-			<!--</plugin>-->
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -327,31 +300,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<profiles>
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-
-					<!-- =========================== -->
-					<!-- HP Fortify scanner -->
-					<!-- =========================== -->
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<scanEnabled>false</scanEnabled>
-							<skip>true</skip>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>