Merge remote-tracking branch 'origin/master' into reintroduce-zeromq-unstable

* origin/master:
  Add tests for inventory_filters and group_by, fix to convert None to empty string.
  Job submission
  Fix up unified job creation parameter passing
  Roll this back, it doesn't do what I expect
  Make sure we propogate source_script into the related fields it needs to be in
  Update job template launch docs with credential_needed_to_start documentation
  Custom Inventory Scripts
  forms/Sources.js
  Add instance filters and group by options for EC2 inventory sources.  Implements https://trello.com/c/QOVhP0mH
  Make sure when we call create_unified_job we can pass important fields as _id or without
  Make sure we pass extra parameters down to the unified job create method so we can pick up credential if given
  Add system job template launch documentation
  Track source_script in summary and related fields for relevant inventory sources
  Host events
  Simplify include_vars based on mpd feedback
  Update the apt-cache when installing python-pip
  Only the primary should syncdb and migrate
  Update package changelogs
  Update release history and process docs
  Update ansible-tower service config in playbook

awx/settings/defaults.py

@@ -387,15 +387,13 @@ EC2_ENABLED_VALUE = 'running'
 EC2_INSTANCE_ID_VAR = 'ec2_id'
 
 # Filter for allowed group/host names when importing inventory from EC2.
-# By default, filter group of one created for each instance, filter all RDS
-# hosts, and exclude all groups without children, hosts and variables.
-EC2_GROUP_FILTER = r'^(?!i-[a-f0-9]{8,}).+$'
+EC2_GROUP_FILTER = r'^.+$'
 EC2_HOST_FILTER = r'^.+$'
 EC2_EXCLUDE_EMPTY_GROUPS = True
 
 
 # ------------
-# -- VMWare --
+# -- VMware --
 # ------------
 VMWARE_REGIONS_BLACKLIST = []
 
@@ -408,7 +406,7 @@ VMWARE_ENABLED_VALUE = 'poweredOn'
 VMWARE_INSTANCE_ID_VAR = 'vmware_uuid'
 
 # Filter for allowed group and host names when importing inventory
-# from EC2.
+# from VMware.
 VMWARE_GROUP_FILTER = r'^.+$'
 VMWARE_HOST_FILTER = r'^.+$'
 VMWARE_EXCLUDE_EMPTY_GROUPS = True