gitignore kate files
Merge remote-tracking branch 'upstream/develop' into develop
Try to decode package names with preferred encoding
Fix modules.useradd so that `home` isn't overloaded with multiple meanings
and then allow states.user to support `createhome` as an alternative to
the multiple meanings of `home`.

This also fixes the edge-case that useradd would under specific
circumstances create a home directory called "True".
rm unused 'osdata' params from grains.core funcs
Add explanatory comment based on #5235
clarify that states.cmd.wait{,_call,_script} ignoring their args is OK; see #5123
Correct arg ordering in states.cmd.run() docstring
% => .format(); avoids pylint W1201
avoid shadowing comment() func in file mod
false positive due to Salt magic
Merge pull request #5358 from hulu/comment-shadowing

avoid shadowing comment() func in file mod
add resource limits in salt-master.upstart to correct issuse #5323

<https://github.com/saltstack/salt/issues/5323>
version needs to be 0.15.2 for salt.spec
Merge pull request #5362 from herlo/develop

version needs to be 0.15.2 for salt.spec
Merge pull request #5342 from jdelic/feature/fix-useradd-homedirs

Fix useradd handling of home directories
Merge pull request #5347 from hulu/unused-osdata-params

rm unused 'osdata' params from grains.core funcs
Merge pull request #5349 from cvrebert/patch-1

Add explanatory comment based on #5235
Merge pull request #5350 from hulu/explain-wait-strangeness

clarify that states.cmd.wait{,_call,_script} ignoring their args is OK
Merge pull request #5351 from cvrebert/patch-2

Correct arg ordering in states.cmd.run() docstring