Merge remote branch 'upstream/master'

awx/ui/static/js/forms/Groups.js

@@ -155,19 +155,6 @@ angular.module('GroupFormDefinition', [])
                     "Only hosts associated with the list of regions will be included in the update process.</p>",
                 dataContainer: 'body'
                 },
-            source_tags: {
-                label: 'Tags',
-                excludeModal: true,
-                type: 'text',
-                ngShow: "source.value == 'ec2'",
-                addRequired: false,
-                editRequired: false,
-                dataTitle: 'Source Regions',
-                dataPlacement: 'left',
-                awPopOver: "<p>Comma separated list of tags. Tag names must match those defined at the inventory source." + 
-                           " Only hosts associated with the list of tags will be included in the update process.</p>",
-                dataContainer: 'body'
-                },
             source_vars: {
                 label: 'Source Variables',
                 ngShow: "source.value == 'file' || source.value == 'ec2'",

awx/ui/static/js/helpers/Groups.js

@@ -824,7 +824,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
                    source_username: scope['source_username'],
                    source_password: scope['source_password'],
                    source_regions: scope['source_regions'],
-                   source_tags: scope['source_tags'],
                    overwrite: scope['overwrite'],
                    overwrite_vars: scope['overwrite_vars'],
                    update_on_launch: scope['update_on_launch'],