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
Merge pull request #8093 from ghjm/mysql-dbname

Switched primary and alias names of the name/db parameter. Fixes #8065.
Merge pull request #8092 from ghjm/mysql-exceptions

Added exception handling to database creation and deletion. Fixes #8075.
Re-fixing ability to have empty json files after inventory refactoring
Errors out with stderr 1049, unknown database: when importing a database that does not exist
Correct regex in is_keyid

The `rpm_key` module claims to take a key ID as an argument, however it fails if one is actually given:

    msg: Not a valid key DEADBEEF

The reason for this is the regular expression in the `RpmKey.is_keyid` method is incorrect; it will only match the literal string "0-9a-f" exactly 8 times, rather than exactly 8 characters in the set 0-9 or a-f.
Merge pull request #8094 from ghjm/vsphere-fixes

Fixed tracebacks during VM creation. Fixes #8067.