ATLAS-3065: fix incorrect name (rename typeDefOptions to options) in merged…

addons/models/1000-Hadoop/1030-hive_model.json

@@ -176,7 +176,7 @@
             ],
             "serviceType": "hive",
             "typeVersion": "1.1",
-            "typeDefOptions": {
+            "options": {
               "schemaElementsAttribute": "columns"
             },
             "attributeDefs": [
@@ -402,7 +402,7 @@
             ],
             "serviceType": "hive",
             "typeVersion": "1.3",
-            "typeDefOptions": {
+            "options": {
               "schemaAttributes": "[\"name\", \"description\", \"owner\", \"type\", \"comment\", \"position\"]"
             },
             "attributeDefs": [

addons/models/2000-RDBMS/2010-rdbms_model.json

@@ -149,7 +149,7 @@
             "superTypes": ["DataSet"],
             "serviceType": "rdbms",
             "typeVersion": "1.2",
-            "typeDefOptions": {
+            "options": {
               "schemaElementsAttribute": "columns"
             },
             "attributeDefs": [
@@ -258,7 +258,7 @@
             "superTypes": ["DataSet"],
             "serviceType": "rdbms",
             "typeVersion": "1.2",
-            "typeDefOptions": {
+            "options": {
               "schemaAttributes": "[\"name\", \"description\", \"owner\", \"data_type\", \"comment\", \" isPrimaryKey\", \" isNullable\"]"
             },
             "attributeDefs": [