Merge pull request #6184 from patrys/patch-1

Properly match existing security group
Update changelog for ec2_snapshot
Addresses #6188 Add --vault-password-file option to the ansible-vault command
Adding a Makefile target for integration tests - "make integration"
Revert "Adding a Makefile target for integration tests - "make integration""

This reverts commit 6f1a58abd35bb7855bf87638b4f99a58e1cb6afd.
Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params

Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
Addresses #6188 Add --vault-password-file to bin/ansible and bin/ansible-playbook
removing some unusued files.  Paramiko alt was an experiment to attempt pipeline for paramiko, ssh_old is the non-pipelining-supported earlier
version of the OpenSSH transport, which is configurable now and unified.
Fixes #6187 Add unit tests for VaultLib
Merge branch 'scottanderson42-ec2-params' into devel
Merge branch 'devel' of https://github.com/muffl0n/ansible into muffl0n-devel
Move where the expanduser call is made, to avoid issues with None
Add negative tests for VaultLib
Merge pull request #6150 from hkariti/fix_join_bug

Fix incorrect use of .join on list causing a traceback
Switch from skipIf to SkipTest for TestVaulLib
Modifying the wait logic for newly created images to avoid tracebacks

Fixes #4619
Add --vault-password-file to bin/ansible-pull
Remove breakpoint
Merge branch 'devel' of https://github.com/josephtate/ansible into josephtate-devel

Conflicts:
	library/cloud/ec2
When looking for double colon len(line) is longer then 1.

Addresses GH-5116.

It comes up that when parsing json that if you are missing the last double quote on the last variable and the next line is just '}' we will get an out of range error. In this instance we will also then make sure that the line is long enough to have two colons.