Merge pull request #6306 from willthames/ec2_module_clearer_failures

Make it easier to determine whether instance creation or tagging fails
Merge pull request #6230 from joshuaconner/bugfix_nova_computer_partial_server_name_match

nova_compute: fix for partial match b/w params['name'] and an existing name
Merge pull request #6104 from gianlucaborello/digitalocean_fix_deletion

Make sure droplet deletion works even when idempotency is achieved using 'name' and 'unique_name' rather than 'id'
Merge pull request #6020 from bpennypacker/ec2_elb_timeout

cloud/ec2_elb module: Added wait_timeout parameter
Update version_added for wait_timeout parameter on elb module.
Merge pull request #5899 from jjneely/ec2.py

ec2.py: Make sure ec2_placement gets handled correctly
Merge pull request #6264 from sqs/cloud-rds-add-new-db-instance-types

Add new cloud/rds DB instance types (db.m3 and db.cr1 families)
Merge pull request #6262 from willthames/ec2_tags_print

Allow ec2_tag module to print the tags of an instance
Merge pull request #5997 from jonasi/elasticache_vpc_security_groups

Elasticache vpc security groups
Set version-added for new parameters in ec2_elb_lb and elasticache
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