gitignore kate files
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
kate undone
Added support for /etc/portage/package.* config files

I've to report an abuse of language in my code:
I've used the word "flag" to refer to everything which follows
the DEPEND atom in those files. This is not correct, they have
different names, but I needed a common word.
Merge pull request #5476 from UtahDave/develop

Refix module name typo is salt.utils.is_windows
use locale.get_encoding
add newline for clarity
copyedit states/layers.rst
Merge pull request #5477 from cvrebert/copyedit

copyedit states/layers.rst
Improve file.directory for clean=True

Handle exclude_pat when running with test=True and add
some tests to verify correct behavior.
Merge pull request #5478 from UtahDave/fix_win_pkg_encoding

Fix win pkg encoding
Add a generic failing sls for tests
Add overstate to test requisites
Add tests for overstate requisites
Add sls that will fail to parse
Add overstate to check parse failures in requisites
Add parse req failure state
docstring fixed