Fix nesting of RedisCreateProperties inside RedisResourceProperties (#746)

* Fix incorrect properties of type RedisCreateProperties inside RedisResourceProperties (with "x-ms-client-flatten": true).

* Fix casing of property names, and move Sku out of RedisProperties, since 'required' apaprently doesn't work on inherited properties.

Author: TimLovellSmith

arm-redis/2015-08-01/swagger/redis.json

@@ -412,15 +412,15 @@
     },
     "RedisProperties": {
       "properties": {
-        "RedisVersion": {
+        "redisVersion": {
           "type": "string",
           "description": "RedisVersion parameter has been deprecated. As such, it is no longer necessary to provide this parameter and any value specified is ignored."
         },
         "sku": {
           "$ref": "#/definitions/Sku",
           "description": "What SKU of Redis cache to deploy."
         },
-        "RedisConfiguration": {
+        "redisConfiguration": {
           "type": "object",
           "additionalProperties": {
             "type": "string"

arm-redis/2016-04-01/swagger/redis.json

@@ -669,7 +669,7 @@
     },
     "RedisProperties": {
       "properties": {
-        "RedisConfiguration": {
+        "redisConfiguration": {
           "type": "object",
           "additionalProperties": {
             "type": "string"
@@ -824,7 +824,11 @@
     },
     "RedisResourceProperties": {
       "properties": {
-        "RedisVersion": {
+        "sku": {
+          "$ref": "#/definitions/Sku",
+          "description": "The SKU of the Redis cache to deploy."
+        },
+        "redisVersion": {
           "readOnly": true,
           "type": "string",
           "description": "Redis version."
@@ -850,12 +854,13 @@
           "type": "integer",
           "format": "int32",
           "description": "Redis SSL port."
-        },
-        "properties": {
-          "$ref": "#/definitions/RedisCreateProperties",
-          "x-ms-client-flatten": true
         }
       },
+      "allOf": [
+        {
+          "$ref": "#/definitions/RedisProperties"
+        }
+      ],
       "description": "Parameters describing a Redis instance."
     },
     "RedisResource": {