Arm 7.18.6 (#115)

* added preview in vm for artifactory & X-ray

* updated artifactory 7.18.6 & X-ray 3.24.2 in templates file and remove -preview from VM

* Updated all changes for Artifactory version 7.18.6 & X-ray version 3.24.2

AzureResourceManager/Artifactory/MP_submission/mainTemplate.json

@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.15",
+      "defaultValue": "0.0.18",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -87,7 +87,8 @@
 	    "0.0.11",
 	    "0.0.12",
 	    "0.0.14",
-	    "0.0.15"
+	    "0.0.15",
+	    "0.0.18"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."