Add a broken test that shows extensions not skipped
Fixed extension filtering in InventoryDirectory
Pull the link out of the alternatives output when not specified

Fixes #7414
Add missing space between var and delimeter
Merge pull request #7437 from mrdeathless/patch-1

Add missing space between var and delimeter
Reset locale to 'C' if the specified one is invalid

Fixes #7448
Adding the capability to proxy the ssl cert check

The ssl cert check will now respect the http and https proxy
environment settings. The url may also have the username/password
embedded, in which case basic auth will be used to connect to the
proxy server.

Fixes #7413
Default use_proxy to True for fetch_url()

Also added some error handling to the fetch_url() call in the
apt_repository module, so that failures to look up the PPA info
are properly handled.

Fixes #7322
Merge pull request #7412 from bellkev/fix_skip_dir_inventory_extensions

Fix skip dir inventory extensions
Also set the environment variables when resetting the locale to C
Don't use listify_ function, when all we want to do is template variables

This was causing a bug in the env module, due to the fact that we now
pass variables for the module through the templating engine combined
with the fact that we split-up the hostvars and setup variables. As a
result, if a variable in the env lookup had the same name as the variable
in Ansible, it would try and template itself over and over again until
the recursion limit would be hit, at which time an empty string was
returned.

Fixes #7396
Add example 'Specify grants composed of more than one word' to the mysql_user module.
Don't re-query inventory when trimming failed/dark hosts

Since the filter list contains hosts, passing that back to list_hosts()
in the inventoy causes issues when the hostname is an IPv6 address
(with :'s interpreted as group unions). Since we already have the list
of hosts, we should not need to pass that back through inventory a
second time.

Fixes #7446
Support internal-only ELBs in EC2.
now module searches for update-alternatives vs hardcoding it
Merge pull request #7470 from bcoca/update_bin

now module searches for update-alternatives vs hardcoding it
Merge branch 'multi-word-mysql-grant-example' of https://github.com/webmat/ansible into webmat-multi-word-mysql-grant-example
Merge branch 'webmat-multi-word-mysql-grant-example' into devel
Merge branch 'elb-internal' of https://github.com/asnare/ansible into asnare-elb-internal
Merge branch 'asnare-elb-internal' into devel