ansible_ec2_instance-id key incorrect

ansible_ec2_instance-id should be ansible_ec2_instance_id

fatal: [*IP*] => One or more undefined variables: 'dict object' has no attribute 'ansible_ec2_instance-id'
removed port from domain name qualification, fixes 7941
Support a whitelisted subset of jinja2 template options
Provision VM using virtual network.
Merge pull request #8026 from hfinucane/jinja-args

Support a whitelisted subset of jinja2 template options
Data from inventory scripts should be able to use nested Jinja2 expressions.
Remove validation of RDS DB instance type names because Amazon frequently adds new ones
Merge pull request #8015 from cchurch/test_win_service

win_service module updates and tests
Merge pull request #8012 from cchurch/callback_cleanup

Callback plugin cleanup
Fix missing msg argument

The following patch adds a missing 'msg=' syntax. An exception is raised
in ansible if this block is reached during the execution of the module

    TypeError: fail_json() takes exactly 1 argument (2 given)

With the 'msg=' added, you get a more informative error. For example

    msg: No settings provided to update_domain().
Allow empty yaml vars files

Fixes #7843
Merge pull request #8024 from kcghost/7941

removed port from domain name qualification, fixes #7941
Merge pull request #8022 from psa/vpc-gateway-peering

Fix for #7368 breaks peering connections. Unreak them.
Merge pull request #8023 from btashton/patch-1

ansible_ec2_instance-id key incorrect
Merge pull request #8036 from sqs/remove-fragile-RDS-instance-type-validation

Remove validation of RDS DB instance type names because Amazon frequently adds new ones
Merge pull request #8038 from caphrim007/correct-missing-msg-argument

Fix missing msg argument
Merge pull request #8007 from msabramo/nova.py_set_defaults

nova.py: Set defaults for OpenStack settings
Added script for configuring winrm for Ansible

The script can be used to set up a windows host with WinRM with the least possible effort.
improved msi
Revert "improved msi"

This reverts commit 7eac2121a54b8859aecbd5af37ef3adcec4d5da7.