Add note about multiple extends of a single state
Merge pull request #11758 from basepi/extenddocs

Add note about multiple extends of a single state
Merge pull request #11741 from garethgreenaway/develop

Adding a new state to manage ipset sets.  Additional functions and some ...
Implement makedirs in file.managed.
use func_alias for makedirs, lint fixes

This commit changes makedirs() to makedirs_() and makes a func_alias, so
that the makedirs params don't override them. It also makes several lint
fixes that clean up unused variables, replaced built-ins, etc.
Pass makedirs to file.managed, file.serialize states

Also some lint fixes, and since states modules aren't supposed to
directly make changes, two calls to os.makedirs() have been replaced.

Conflicts:
	salt/states/file.py
Cleanup call to file.check_managed

This function no longer contains a makedirs param, so remove it.
fix error message when no changes made
win_file: make file.makedirs a func_alias
Fix re-namespacing error
add makedirs to cp.get_template
fix issue 11760, host entries append to eol, even lines with comments
Added support for symlinks on Windows.
Added new module disk.blkid and added support mount by UUID for mount state.
dont fail the fileserver because of dangling symlinks
Fix a possible typo in aptpkg module
Merge pull request #11767 from sirkonst/blkid_and_mount_by_uuid

Added new module disk.blkid and added support mount by UUID for mount state
Merge pull request #11765 from slai/9379-win-symlinks

Added support for symlinks on Windows (#9379)
Fix E1002: Use of super on an old style class.
Disable W0232, no `__init__` method.