fix duplicated method
changed "update" parameter with more general "options"
new tests for unzip with options parameters
fix format order
Custom grains directories
Merge pull request #9976 from terminalmage/packaging

Update RPM spec for 0.17.5
Handle better state errors

This fixes #9983.
Doc: fix grains.filter_by example on default argument usage
Fix states.file.accumulated docstring
Issue #9932: GitPillar.update called on 1st branch

GitPillar.update was only called for first entry
in ext_pillar, which usually is the master branch.
Issue #9932: Update git pillar after init

Update GitPillar by calling update() after initializing the repo.
Also, pass the branch to Pillar class constructor.
Fixed issue #9932

If an ext_pillar item is not loaded and its branch
is not present in pillar_roots, the corresponding
salt environment will not be available. However,
this is not an issue, since it will be available
when all of ext_pillar items are parsed; therefore,
when trying to get the SLS from that non-present
salt environment, we should merely log a debug
message and continue on.
Merge pull request #9990 from Lothiraldan/feature/States.file.accumulated_docstring

Fix states.file.accumulated docstring
Fix variable scope issue

Resolves #9919.
Fix ref to changed parameter name in file.stats

A few weeks ago in 7d4c470, the argument name "follow_symlink" was
changed for consisency with the rest of the functions in the "file"
execution module. This commit fixes a missed ref to the file.stats
function.
Merge pull request #9993 from terminalmage/issue9919

Fix variable scope issue
Added snapshot option to linux_lvm.lvcreate
Catch bad args in salt-call

Instead of throwing an ugly stack trace, catch a type error, format the exception and display it. Then exit with a proper retcode.
virt runner: delete key from master when VM is purged
Added cmd_batch to Python API documentation