Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
diff --git a/vid-app-common/src/main/resources/json/mso/modelInfo b/vid-app-common/src/main/resources/json/mso/modelInfo
index d368e35..56d268c 100755
--- a/vid-app-common/src/main/resources/json/mso/modelInfo
+++ b/vid-app-common/src/main/resources/json/mso/modelInfo
@@ -31,16 +31,7 @@
 		},

 		"modelType": {

 			"description": "short description of the entity being operated on",

-			"type": "string",

-			"enum": [

-			    "pnf",

-				"network",

-				"service",

-				"vfModule",

-				"vnf",

-				"volumeGroup",

-				"configuration"

-			]

+			"type": "string"

 		},

 		"modelVersion": {

 			"description": "the version of the model as defined in SDC--not authoritative",