fixing bug where if both private_ip and assign_public_p are set ansible fails out
cleaning up the code a bit more
Add missing info for the append option

Both 'default' and 'choices' options were missing at the documentation.
Merge pull request #7011 from hernandesbsousa/devel

Add missing info for the append option for user module
Try to pass in item to on_skippped callback.
Merge branch 'devel' of https://github.com/evanccopengeo/ansible into evanccopengeo-devel
Merge pull request #7021 from smoothify/skipped-items

skipped callback in loop does not display 'item'.
Check resource_tags value before using it in ec2_vpc

Fixes #7024
docker.client.APIError has moved to docker.errors.APIError

see https://github.com/dotcloud/docker-py/commit/18d4db09ecc79cef49830fa2c28c5e99dd02be42
Merge pull request #7029 from mattjbray/docker-api-error

docker.client.APIError has moved to docker.errors.APIError
hint to install python-ssl on redhat systems
Merge pull request #7044 from 42wim/devel

hint to install python-ssl on redhat systems