Merge branch 'fix_selinux_debian' of https://github.com/mscherer/ansible into mscherer-fix_selinux_debian
Merge branch 'ec2_eip' of https://github.com/lorin/ansible into lorin-ec2_eip
Minor pep8 cleanup in ec2_eip module
Updating CHANGELOG for the ec2_eip module addition
Merge branch 'maxamillion/firewalld' of https://github.com/maxamillion/ansible into maxamillion-maxamillion/firewalld
Moving firewalld module from net_infra to system
More housekeeping

* Modified version_added strings in recent modules
* Added firewalld inclusion to the CHANGELOG
add more tests :
 - test part of ansible.runner.filter_plugins.core
 - test ansible.utils.unfrackpath
file: implemented state=touched. Closes GH-4097
Merge pull request #4196 from mscherer/more_tests

add more tests :
supervisorctl module: adding support for custom supervisord installations

Supervisord can be installed at the user level or system level.
Installating as a user is particularly useful for systems without root access.

Adds the ability to provide a custom supervisorctl executable path, supporting custom installations
file: skip in check_mode if state=touched
file: added file attributes in state=touched
Fixed setup module to no longer break on OpenBSD release versions.
fix examples for with_nested
Merge pull request #4203 from candeira/with_nested

fix documentation examples for with_nested
Merge branch 'feature/file-state-touched' of https://github.com/resmo/ansible into resmo-feature/file-state-touched
Change touched -> touch for new file state, and cleaning up docs
Updating CHANGELOG
Fix the install destination