pull from int branch

ui/admin/app/components/form/host-catalog/aws/index.hbs

@@ -124,7 +124,7 @@
     readonly={{false}}
   />
 
-  <form.input
+  {{!-- <form.input
     @name='accesskey'
     @type='accesskey'
     @value='accesskey'
@@ -138,7 +138,7 @@
     @value='secretaccesskey'
     @label='Secret Access Key'
     readonly={{false}}
-  />
+  /> --}}
 
   {{#if (can 'save model' @model)}}
     <form.actions

ui/admin/app/components/form/host-catalog/azure/index.hbs

@@ -117,14 +117,14 @@
   {{/if}}
 
   <form.input
-    @name='Region'
-    @type='region'
-    @value='region'
-    @label='Azure Region'
+    @name='tenant_id'
+    @type='tenant_id'
+    @value='tenant_id'
+    @label='Tenant ID'
     readonly={{false}}
   />
 
-  <form.input
+  {{!-- <form.input
     @name='accesskey'
     @type='accesskey'
     @value='accesskey'
@@ -138,7 +138,7 @@
     @value='secretaccesskey'
     @label='Secret Access Key'
     readonly={{false}}
-  />
+  /> --}}
 
   {{#if (can 'save model' @model)}}
     <form.actions