ec2_eip integration tests.
Added instance_type to  ec2_lc variable list
updated example to include instance_type
Merge branch 'integration_test_eip' of https://github.com/jsmartin/ansible into jsmartin-integration_test_eip
Merge pull request #7153 from budlight/patch-1

Added instance_type to  ec2_lc variable list
Missing 'base64' import
Merge pull request #7156 from ricard33/patch-2

Missing 'base64' import
add simplejson as alternative to json
Merge pull request #7160 from mkosmach/devel

Please add simplejson as alternative to json in apt_rpm
ec2_elb_lb integration tests.
A few updates to the ec2_elb_lb integration test
Fix example
Update playbooks_delegation.rst
Merge pull request #7168 from jjshoe/fix_apache2_module_docs

Fix example
Merge pull request #7169 from mjfroehlich/patch-1

Small docs edit
Remove --timeout option to rsync from synchronize defaults

The current 10-second default timeout for rsync seems to be behind issue #6809.

As a workaround for the underlying issue in rsync when different versions are
used on the source and destination sides, don't include the timeout option
unless the user specifies a timeout > 0.
Do not fail if we try to generate a ssh key for a user without being root

If we try to use the user module without being root, it fail on RHEL/Fedora
because usermod --help cannot be run. The root cause is lack of permission
due to EAL4+ certification, as seen in shadow-utils changelo.

So if we cannot run it, assume there is no append. It doesn't matter
much since we will not be able to run usermod at all with or without the
option.
Merge branch 'fix_user_non_root_on_rhel' of https://github.com/mscherer/ansible into mscherer-fix_user_non_root_on_rhel
Documentation fix for #7139: correct information on port numbers,
and clarify precendence for when both inventory and SSH config have ports listed.'
Fine-tune/tweak last documentation fix. This is better!