xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>adapters</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.openecomp.so.adapters</groupId>
        <artifactId>mso-adapter-utils</artifactId>
        <name>mso-adapter-utils</name>
        <description>Common MSO utilities, including Openstack client wrappers.</description>
 
        <dependencies>
                <dependency>
-                       <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+                       <groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
                        <artifactId>keystone-client</artifactId>
                        <version>${openstack.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+                       <groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
                        <artifactId>heat-client</artifactId>
                        <version>${openstack.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId>
+                       <groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
                        <artifactId>quantum-client</artifactId>
                        <version>${openstack.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.libs.openstack-java-sdk.client-connectors</groupId>
+                       <groupId>org.openecomp.so.libs.openstack-java-sdk.client-connectors</groupId>
                        <artifactId>http-connector</artifactId>
                        <version>${openstack.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>common</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-catalog-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>adapters</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.openecomp.so.adapters</groupId>
        <artifactId>mso-adapters-rest-interface</artifactId>
        <packaging>jar</packaging>
        <name>mso-adapters-rest-interface</name>
                <version>3.0.19.Final</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-adapter-utils</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>adapters</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.openecomp.so.adapters</groupId>
        <artifactId>mso-catalog-db-adapter</artifactId>
        <packaging>war</packaging>
 
 
        <dependencies>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-catalog-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
                        <version>3.0.16.Final</version>
                </dependency>
                <!--<dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>status-control</artifactId>
                        <version>${project.version}</version>
                </dependency>-->
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <modelVersion>4.0.0</modelVersion>\r
        <parent>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
                <artifactId>adapters</artifactId>\r
                <version>1.1.0-SNAPSHOT</version>
        </parent>\r
-       <groupId>org.openecomp.mso.adapters</groupId>\r
+       <groupId>org.openecomp.so.adapters</groupId>\r
        <artifactId>mso-network-adapter-async-client</artifactId>\r
        <packaging>jar</packaging>\r
        <name>mso-network-adapter-async-client</name>\r
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>adapters</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.openecomp.so.adapters</groupId>
        <artifactId>mso-network-adapter</artifactId>
        <packaging>war</packaging>
        <name>mso-network-adapter</name>
                                                <version>2.2.7</version>
                                        </dependency>
                                        <dependency>
-                                               <groupId>org.openecomp.mso.adapters</groupId>
+                                               <groupId>org.openecomp.so.adapters</groupId>
                                                <artifactId>mso-adapter-utils</artifactId>
                                                <version>${project.version}</version>
                                        </dependency>
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-adapter-utils</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-network-adapter-async-client</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-adapters-rest-interface</artifactId>
                        <version>${project.version}</version>
                </dependency>
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>status-control</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>adapters</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.openecomp.so.adapters</groupId>
        <artifactId>mso-requests-db-adapter</artifactId>
        <packaging>war</packaging>
 
        <dependencies>
 
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-requests-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
                        </exclusions>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>status-control</artifactId>
                        <version>${project.version}</version>
                </dependency>
                                                <version>2.2.7</version>
                                        </dependency>
                                        <dependency>
-                                               <groupId>org.openecomp.mso.adapters</groupId>
+                                               <groupId>org.openecomp.so.adapters</groupId>
                                                <artifactId>mso-adapter-utils</artifactId>
                                                <version>${project.version}</version>
                                        </dependency>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>adapters</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.openecomp.so.adapters</groupId>
        <artifactId>mso-sdnc-adapter</artifactId>
        <packaging>war</packaging>
        <name>mso-sdnc-adapter</name>
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-adapter-utils</artifactId>
                        <version>${project.version}</version>
 
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>status-control</artifactId>
                        <version>${project.version}</version>
                </dependency>
         <dependency>
-            <groupId>org.openecomp.mso.adapters</groupId>
+            <groupId>org.openecomp.so.adapters</groupId>
             <artifactId>mso-adapters-rest-interface</artifactId>
             <version>${project.version}</version>
         </dependency>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>adapters</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.openecomp.so.adapters</groupId>
        <artifactId>mso-tenant-adapter</artifactId>
        <packaging>war</packaging>
        <name>mso-tenant-adapter</name>
                                                <version>2.2.7</version>
                                        </dependency>
                                        <dependency>
-                                               <groupId>org.openecomp.mso.adapters</groupId>
+                                               <groupId>org.openecomp.so.adapters</groupId>
                                                <artifactId>mso-adapter-utils</artifactId>
                                                <version>${project.version}</version>
                                        </dependency>
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-adapter-utils</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-adapters-rest-interface</artifactId>
                        <version>${project.version}</version>
                </dependency>
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>status-control</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <modelVersion>4.0.0</modelVersion>\r
        <parent>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
                <artifactId>adapters</artifactId>\r
                <version>1.1.0-SNAPSHOT</version>
        </parent>\r
-       <groupId>org.openecomp.mso.adapters</groupId>\r
+       <groupId>org.openecomp.so.adapters</groupId>\r
        <artifactId>mso-vnf-adapter-async-client</artifactId>\r
        <packaging>jar</packaging>\r
        <name>mso-vnf-adapter-async-client</name>\r
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <modelVersion>4.0.0</modelVersion>\r
        <parent>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
                <artifactId>adapters</artifactId>\r
                <version>1.1.0-SNAPSHOT</version>
        </parent>\r
-       <groupId>org.openecomp.mso.adapters</groupId>\r
+       <groupId>org.openecomp.so.adapters</groupId>\r
        <artifactId>mso-vnf-adapter</artifactId>\r
        <packaging>war</packaging>\r
        <name>mso-vnf-adapter</name>\r
                                </executions>\r
                                <dependencies>\r
                                        <dependency>\r
-                                               <groupId>org.openecomp.mso.adapters</groupId>\r
+                                               <groupId>org.openecomp.so.adapters</groupId>\r
                                                <artifactId>mso-adapter-utils</artifactId>\r
                                                <version>${project.version}</version>\r
                                        </dependency>\r
        </build>\r
        <dependencies>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso.adapters</groupId>\r
+                       <groupId>org.openecomp.so.adapters</groupId>\r
                        <artifactId>mso-adapter-utils</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso.adapters</groupId>\r
+                       <groupId>org.openecomp.so.adapters</groupId>\r
                        <artifactId>mso-adapters-rest-interface</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso.adapters</groupId>\r
+                       <groupId>org.openecomp.so.adapters</groupId>\r
                        <artifactId>mso-vnf-adapter-async-client</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                        <scope>provided</scope>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>status-control</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
 \r
                <!-- <dependency> -->\r
-               <!-- <groupId>org.openecomp.mso</groupId> -->\r
+               <!-- <groupId>org.openecomp.so</groupId> -->\r
                <!-- <artifactId>mso-catalog-db</artifactId> -->\r
                <!-- <version>${project.version}</version> -->\r
                <!-- </dependency> -->\r
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>adapters</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
-       <groupId>org.openecomp.mso.adapters</groupId>
+       <groupId>org.openecomp.so.adapters</groupId>
        <artifactId>mso-workflow-message-adapter</artifactId>
        <packaging>war</packaging>
        <name>mso-workflow-message-adapter</name>
 
        <dependencies>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-adapter-utils</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso.adapters</groupId>
+                       <groupId>org.openecomp.so.adapters</groupId>
                        <artifactId>mso-adapters-rest-interface</artifactId>
                        <version>${project.version}</version>
                </dependency>
                        <version>4.5.2</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>status-control</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.openecomp</groupId>
-               <artifactId>mso</artifactId>
+               <artifactId>so</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
-       <groupId>org.openecomp.mso</groupId>
+       <groupId>org.openecomp.so</groupId>
        <artifactId>adapters</artifactId>
        <name>MSO Adapters</name>
        <description>Adapters for MSO</description>
 
        <modelVersion>4.0.0</modelVersion>\r
        <parent>\r
                <groupId>org.openecomp</groupId>\r
-               <artifactId>mso</artifactId>\r
+               <artifactId>so</artifactId>\r
                <version>1.1.0-SNAPSHOT</version>\r
        </parent>\r
 \r
-       <groupId>org.openecomp.mso</groupId>\r
+       <groupId>org.openecomp.so</groupId>\r
        <artifactId>asdc-controller</artifactId>\r
        <name>asdc-controller</name>\r
        <description>ASDC CLient and Controller</description>\r
                        <scope>test</scope>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>mso-catalog-db</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                </dependency>\r
 \r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>common</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                        <scope>provided</scope>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>status-control</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <parent>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
                <artifactId>bpmn</artifactId>\r
                <version>1.1.0-SNAPSHOT</version>
        </parent>\r
 \r
        <modelVersion>4.0.0</modelVersion>\r
-       <groupId>org.openecomp.mso</groupId>\r
+       <groupId>org.openecomp.so</groupId>\r
        <artifactId>MSOCockpit</artifactId>\r
        <packaging>pom</packaging>\r
        <name>MSOCockpit</name>\r
                </dependency>\r
                \r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>common</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>cockpit-urnmap-plugin</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCoreBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
        <modelVersion>4.0.0</modelVersion>\r
        <parent>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
        <artifactId>bpmn</artifactId>\r
        <version>1.1.0-SNAPSHOT</version>\r
        </parent>\r
                        <version>3.4</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCoreBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <!-- unit test utilities -->\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCoreBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                        <classifier>tests</classifier>\r
        <version>4.3.2.RELEASE</version>\r
        </dependency>\r
        <dependency>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
                <artifactId>MSOMockServer</artifactId>\r
                <version>${project.version}</version>\r
                <classifier>classes</classifier>\r
                <scope>test</scope>\r
        </dependency>\r
        <dependency>\r
-         <groupId>org.openecomp.mso</groupId>\r
+         <groupId>org.openecomp.so</groupId>\r
          <artifactId>MSORESTClient</artifactId>\r
          <version>${project.version}</version>\r
        </dependency>\r
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.openecomp.mso</groupId>
+        <groupId>org.openecomp.so</groupId>
         <artifactId>bpmn</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openecomp.mso</groupId>
+    <groupId>org.openecomp.so</groupId>
     <artifactId>MSOCoreBPMN</artifactId>
     <packaging>jar</packaging>
 
             <artifactId>Saxon-HE</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.mso</groupId>
+            <groupId>org.openecomp.so</groupId>
             <artifactId>common</artifactId>
             <version>${project.version}</version>
         </dependency>
             <version>1.6</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.mso</groupId>
+            <groupId>org.openecomp.so</groupId>
             <artifactId>status-control</artifactId>
             <version>${project.version}</version>
         </dependency>
 
                Assert.assertEquals("testValue", props.get("testKey"));
                props.put("newKey", "newvalue");
        }
-       
-       @Test
-       public void testNotAllowedPropertyReloading() throws IOException {
-               Path msoConfigPath = Paths.get(System.getProperty("mso.config.path"));
-               Path backupPropFilePath = msoConfigPath.resolve("backup-" + PropertyConfiguration.MSO_BPMN_PROPERTIES);
-
-               try {
-                       // Create a new file... a backup file
-                       Files.createFile(backupPropFilePath);
-
-                       // Load properties
-                       PropertyConfiguration propertyConfiguration = PropertyConfiguration.getInstance();
-                       Map<String,String> props = propertyConfiguration.getProperties(PropertyConfiguration.MSO_BPMN_PROPERTIES);
-                       Assert.assertNotNull(props);
-                       Assert.assertEquals("testValue", props.get("testKey"));
-
-                       // Update the backup file
-                       Path bpmnPropertiesSourcePath = Paths.get("src", "test", "resources", "mso.bpmn.properties");
-                       Files.copy(bpmnPropertiesSourcePath, backupPropFilePath, StandardCopyOption.REPLACE_EXISTING);
-
-                       // Cache size should remain the same
-                       Assert.assertEquals(1, PropertyConfiguration.getInstance().cacheSize());
-               } finally {
-                       backupPropFilePath.toFile().delete();
-               }
-       }
 }
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <parent>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
                <artifactId>bpmn</artifactId>\r
                <version>1.1.0-SNAPSHOT</version>\r
        </parent>\r
                        <version>3.4</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCoreBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCommonBPMN</artifactId>\r
                        <version>${project.version}</version>\r
            </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCommonBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                        <classifier>tests</classifier>\r
                </dependency>\r
                <dependency>\r
                        <!-- unit test utilities -->\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCoreBPMN</artifactId>\r
                        <version>${project.version}</version>\r
                        <classifier>tests</classifier>\r
        <version>4.3.2.RELEASE</version>\r
        </dependency>\r
        <dependency>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
                <artifactId>MSOMockServer</artifactId>\r
                <version>${project.version}</version>\r
                <scope>test</scope>\r
                <classifier>classes</classifier>\r
        </dependency>\r
        <dependency>\r
-         <groupId>org.openecomp.mso</groupId>\r
+         <groupId>org.openecomp.so</groupId>\r
          <artifactId>MSORESTClient</artifactId>\r
          <version>${project.version}</version>\r
        </dependency>\r
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <parent>
-        <groupId>org.openecomp.mso</groupId>
+        <groupId>org.openecomp.so</groupId>
         <artifactId>bpmn</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
-       <groupId>org.openecomp.mso</groupId>
+       <groupId>org.openecomp.so</groupId>
        <artifactId>MSOMockServer</artifactId>
        <packaging>war</packaging>
 
 
        <modelVersion>4.0.0</modelVersion>\r
        \r
        <parent>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
         <artifactId>bpmn</artifactId>\r
                <version>1.1.0-SNAPSHOT</version>
        </parent>\r
        \r
-       <groupId>org.openecomp.mso</groupId>\r
+       <groupId>org.openecomp.so</groupId>\r
        <artifactId>MSORESTClient</artifactId>\r
        \r
        <packaging>jar</packaging>\r
 
        <modelVersion>4.0.0</modelVersion>\r
 \r
        <parent>\r
-               <groupId>org.openecomp.mso</groupId>\r
+               <groupId>org.openecomp.so</groupId>\r
                <artifactId>bpmn</artifactId>\r
                <version>1.1.0-SNAPSHOT</version>\r
        </parent>\r
 \r
-       <groupId>org.openecomp.mso</groupId>\r
+       <groupId>org.openecomp.so</groupId>\r
        <artifactId>cockpit-urnmap-plugin</artifactId>\r
 \r
        <packaging>jar</packaging>\r
                        <scope>provided</scope>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.mso</groupId>\r
+                       <groupId>org.openecomp.so</groupId>\r
                        <artifactId>common</artifactId>\r
                        <version>${project.version}</version>\r
                        <scope>compile</scope>\r
 
 
        <parent>
                <groupId>org.openecomp</groupId>
-               <artifactId>mso</artifactId>
+               <artifactId>so</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
-       <groupId>org.openecomp.mso</groupId>
+       <groupId>org.openecomp.so</groupId>
        <artifactId>bpmn</artifactId>
        <name>BPMN Subsystem</name>
        <description>BPMN Subsystem for MSO</description>
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.openecomp</groupId>
-        <artifactId>mso</artifactId>
+        <artifactId>so</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.openecomp.mso</groupId>
+    <groupId>org.openecomp.so</groupId>
     <artifactId>common</artifactId>
     <name>MSO Common classes</name>
     <description>MSO Common classes:- Logger</description>
                        </executions>
                        <dependencies>
                                <dependency>
-                                       <groupId>org.openecomp.mso</groupId>
+                                       <groupId>org.openecomp.so</groupId>
                                        <artifactId>common</artifactId>
                                        <version>${project.version}</version>
                                </dependency>
 
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>mso-api-handlers</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
 
-       <groupId>org.openecomp.mso</groupId>
+       <groupId>org.openecomp.so</groupId>
        <artifactId>mso-api-handler-common</artifactId>
 
        <name>ECOMP MSO API Handler common</name>
                </dependency>
 
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-catalog-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-requests-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>mso-api-handlers</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
                </dependency>
 
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-catalog-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-requests-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-api-handler-common</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>status-control</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>mso-api-handlers</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
                        <version>1.0.0.Final</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>common</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.openecomp</groupId>
-               <artifactId>mso</artifactId>
+               <artifactId>so</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
-       <groupId>org.openecomp.mso</groupId>
+       <groupId>org.openecomp.so</groupId>
        <artifactId>mso-api-handlers</artifactId>
        <name>API Handler</name>
        <description>API Handler for MSO</description>
 
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.openecomp</groupId>
-               <artifactId>mso</artifactId>
+               <artifactId>so</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
-       <groupId>org.openecomp.mso</groupId>
+       <groupId>org.openecomp.so</groupId>
        <artifactId>mso-catalog-db</artifactId>
        <name>mso-catalog-db</name>
        <description>MSO Catalog Database definition and Hibernate objects</description>
              <scope>test</scope>
         </dependency>
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>common</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>packages</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
-       <groupId>org.openecomp.mso.packages</groupId>
+       <groupId>org.openecomp.so.packages</groupId>
        <name>Arquillian Unit Testing on MSO</name>
        <artifactId>arquillian-unit-tests</artifactId>
 
                </dependency>
 
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>asdc-controller</artifactId>
                        <version>${project.version}</version>
                        <scope>test</scope>
                </dependency>
 
                <!-- <dependency>
-            <groupId>org.openecomp.mso.adapters</groupId>
+            <groupId>org.openecomp.so.adapters</groupId>
             <artifactId>mso-appc-adapter</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
                </dependency>
 
                <dependency>
-                       <groupId>org.openecomp.mso</groupId>
+                       <groupId>org.openecomp.so</groupId>
                        <artifactId>mso-catalog-db</artifactId>
                        <version>${project.version}</version>
                        <scope>test</scope>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>packages</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
-       <groupId>org.openecomp.mso.packages</groupId>
+       <groupId>org.openecomp.so.packages</groupId>
        <artifactId>mso-deliveries</artifactId>
        <packaging>pom</packaging>
 
 
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.openecomp.mso</groupId>
+               <groupId>org.openecomp.so</groupId>
                <artifactId>packages</artifactId>
                <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <packaging>pom</packaging>
-       <groupId>org.openecomp.mso</groupId>
+       <groupId>org.openecomp.so</groupId>
        <artifactId>docker</artifactId>
 
        <name>MSO Docker Deliveries</name>
 
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <modelVersion>4.0.0</modelVersion>\r
        <parent>\r
-               <artifactId>mso</artifactId>\r
+               <artifactId>so</artifactId>\r
                <groupId>org.openecomp</groupId>\r
                <version>1.1.0-SNAPSHOT</version>\r
        </parent>\r
 \r
-       <groupId>org.openecomp.mso</groupId>\r
+       <groupId>org.openecomp.so</groupId>\r
        <artifactId>packages</artifactId>\r
        <packaging>pom</packaging>\r
        <name>MSO Packages</name>\r
 
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.openecomp</groupId>
-       <artifactId>mso</artifactId>
+       <artifactId>so</artifactId>
        <packaging>pom</packaging>
        <version>1.1.0-SNAPSHOT</version>
        <name>MSO main project</name>
                <org.apache.maven.user-settings></org.apache.maven.user-settings>
                <!-- this is used for Chef mso-code cookbook -->
                <swm.version>2.19.3-1</swm.version>
-               <openstack.version>1.1.0</openstack.version>
+               <openstack.version>1.1.0-SNAPSHOT</openstack.version>
                <evosuiteVersion>1.0.4-alpha2</evosuiteVersion>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 
     <modelVersion>4.0.0</modelVersion>\r
     <parent>\r
         <groupId>org.openecomp</groupId>\r
-        <artifactId>mso</artifactId>\r
+        <artifactId>so</artifactId>\r
         <version>1.1.0-SNAPSHOT</version>
     </parent>\r
 \r
-    <groupId>org.openecomp.mso</groupId>\r
+    <groupId>org.openecomp.so</groupId>\r
     <artifactId>status-control</artifactId>\r
     <name>MSO Status Control module</name>\r
     <description>Contains classes to update and query the MSO status per site</description>\r
              <scope>test</scope>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.openecomp.mso</groupId>\r
+            <groupId>org.openecomp.so</groupId>\r
             <artifactId>common</artifactId>\r
             <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.openecomp.mso</groupId>\r
+            <groupId>org.openecomp.so</groupId>\r
             <artifactId>mso-catalog-db</artifactId>\r
             <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.openecomp.mso</groupId>\r
+            <groupId>org.openecomp.so</groupId>\r
             <artifactId>mso-requests-db</artifactId>\r
             <version>${project.version}</version>\r
         </dependency>\r