AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>
diff --git a/common/src/test/resources/mso2.json b/common/src/test/resources/mso2.json
index ee7fe12..bac30c4 100644
--- a/common/src/test/resources/mso2.json
+++ b/common/src/test/resources/mso2.json
@@ -1,41 +1,20 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-  "asdc-connections":{
-    "asdc-controller1":{
-        "asdcUser": "user1B",
-        "asdcConsumerGroup": "consumer1",
-        "asdcConsumerId": "consumer1",
-        "asdcEnvironmentName": "PROD",
-        "asdcAddress": "localhost:8443",
-        "asdcPassword": "1c551b8b5ab91fcd5a0907b11c304199"
-    },
-    "asdc-controller2":{
-        "asdcUser": "user2B",
-        "asdcConsumerGroup": "consumer2",
-        "asdcConsumerId": "consumer2",
-        "asdcEnvironmentName": "E2E",
-        "asdcAddress": "localhost:8443",
-        "asdcPassword": "1c551b8b5ab91fcd5a0907b11c304199"
-    }
-  }
-  
-}
+	"asdc-connections": {
+		"asdc-controller1": {
+			"asdcUser": "user1B",
+			"asdcConsumerGroup": "consumer1",
+			"asdcConsumerId": "consumer1",
+			"asdcEnvironmentName": "PROD",
+			"asdcAddress": "localhost:8443",
+			"asdcPassword": "1c551b8b5ab91fcd5a0907b11c304199"
+		},
+		"asdc-controller2": {
+			"asdcUser": "user2B",
+			"asdcConsumerGroup": "consumer2",
+			"asdcConsumerId": "consumer2",
+			"asdcEnvironmentName": "E2E",
+			"asdcAddress": "localhost:8443",
+			"asdcPassword": "1c551b8b5ab91fcd5a0907b11c304199"
+		}
+	}
+}
\ No newline at end of file