Merge branch 'hiciu-fix-7206' into devel
fixed the choices typo got the ec2_asg module
Merge branch 'psa-resource-tag-required' into devel
Add note about changing resource_tags to required in ec2_vpc
Merge pull request #8086 from dataxu/dev-fix-typo

Bug Fix - fixed the choices typo got the ec2_asg module
Merge branch 'devel' of https://github.com/danslimmon/ansible into danslimmon-devel
Merge branch 'danslimmon-devel' into devel
Merge pull request #8080 from ciupicri/service

Remove unused code
Fix hostname when get_distribution_version() returns a string.

The distro version is a string ('jessie/sid') on Debian unstable and testing.
Because load_platform_subclass() evaluations every subclass as it loops,
comparing numbers when get_distribution_version() does not return a number will
break.

This patch fixes that by returning a number (`0`) when we have an invalid
version, instead of returning `None` or a string.
Updating google scripts for the docsite
Merge branch 'svg_and_inventory_refactor' into devel
Adding a Collins inventory script for Ansible
Moving to_safe back into class for consistency purposes
Don't write to cache if queries fail
Merge pull request #8089 from ssalevan/ssalevan/add-collins-inventory

Adding a Collins inventory script for Ansible
Correcting var blending integration test
Added exception handling to database creation and deletion. Fixes #8075.
Switched primary and alias names of the name/db parameter, to match documentation. Fixes #8065.
Fixed tracebacks when datacenter not found, when notes not given, and when collecting facts after VM creation. Fixes #8067.
Documentation simplification for git module parameter