Merge branch 'ec2_security_token' of https://github.com/willthames/ansible into willthames-ec2_security_token
Merge pull request #5916 from tidzo/issue4992

Fix for #4992 - Add userdata to cloud/nova_compute
Updating profile/security_token version_added labels
Merge pull request #5703 from ethercrow/fakes3

[s3] Compatibility with fakes3.
Merge branch 'willthames-ec2_security_token' into devel
Merge pull request #5454 from claco/rax_identity

Add rax_identity module
Merge branch 'drcapulet/ec2-sourcedestcheck' of https://github.com/drcapulet/ansible into drcapulet-drcapulet/ec2-sourcedestcheck
Merge pull request #5287 from ebrevdo/ec2_vol_existing

ec2_vol module: add support for name / id to mount volume on instance
Merge branch 'josephtate-devel' into devel
Update docstrings in ec2_vol
Merge branch 'ec2-eip-reuse' of https://github.com/silkapp/ansible into silkapp-ec2-eip-reuse
Merge pull request #4845 from lorin/ec2_ubuntu_ami

New module: ec2_ami_search
Renaming reuse parameter in ec2_eip and adding a version_added string
Merge branch 'silkapp-ec2-eip-reuse' into devel
Update docstrings in ec2_ami_search
Merge pull request #5935 from zimbatm/do-backups

library/digital_ocean: Adds the missing backups_enabled create option
Update docstring in digital_ocean for backups_enabled version_added
Merge pull request #6394 from jlaska/gitignore_test_output

Add generated test files to .gitignore
Added support for pkgng multiple repositories.

Currently checking if pkgng >= 1.1.4, as specified in
https://wiki.freebsd.org/pkgng . I guess that's when using PKGSITE was
deprecated.
Changed old variable names that referred to pkgin.