Merge remote-tracking branch 'upstream/develop' into develop
Make distinction in apt between removed and purged pkgs

This fixes #4972 by allowing removed packages to be purged using
pkg.purge (and pkg.purged states).
Merge remote-tracking branch 'upstream/develop' into develop
pkg mod_init change proposal
I want to allow the gentoo users to set use flags and keywords directly
in pkg.install, but to do this I need to enforce a specific enviroment.
So I thought I'd add to pkg mod_init the ability to execute a special "ex_mod_init"
function from the execution module.
In this way the new ebuild.py will be able to do its checks.
The others pkg modules will not need to be modified.
What do you think about this?
Fix traceback when nodegroups are empty

This fixes #5500 by reverting the nodegroups dict in the master config
to its default value when 'nodegroups:' is uncommented in the master
config and there are no nodegroups configured.
Merge pull request #5501 from terminalmage/issue5500

Fix traceback when nodegroups are empty
Add missing imports so file.managed works

Fixes #5406
Merge pull request #5502 from UtahDave/fix_filemanaged

Add missing imports so file.managed works
Removed line numbers from master/minion conf file examples

This change is to lazily side-step Sphinx issues rendering code
alongside line numbers. Aligning the line numbers <td> with the code
<td> is dumb and I'd like to patch the HTMLWriter to output
Bootstrap-compatible <ol>'s instead.
Return empty dict for list_pkgs(removed=True) where not supported

This commit implements the new 'removed' kwarg added to apt (and the
pkg.purged state) in 806342d.
bug & style fixes based on pylint report
Merge pull request #5506 from hulu/pylint-fixes-2

bug & style fixes based on pylint report
Use win32 newlines in templated files on windows

Fixes #4355
Merge pull request #5507 from UtahDave/template_win_newlines

Use win32 newlines in templated files on windows
Perform service availability checks first for all service states

This commit makes service states return more meaningful/accurate
information by first checking if the service is available before trying
to do anything. Fixes #5464.
slight comment tweak for consistency
Fix some formatting
Add docs for enabling EPEL in RHEL
Merge pull request #5510 from basepi/rheldocs

Add docs for enabling EPEL in RHEL
Removed runner docs qualifier

I'm not sure what this was for...