Fix variable definition in wrong scope

File "/usr/lib/python2.7/dist-packages/salt/states/pkg.py", line 702
UnboundLocalError: local variable 'modified_hold' referenced before assignment
added runner pillar.show_pillar
Update pillar.py

PEP8 W391: blank line at end of file
PEP8 E711: comparison to None ...
PEP8 E302: expected 2 blank lines, found 0
Allow multiple identities for git

Sometimes, multiple private keys must be tried in order to get git
clone/pull/rebase to play nicely with a ssh connection. This patch
allows for this by allowing identities to be a list (but casting if it's
not).

A good example of this is when using private repositories that contain
submodules. GitHub does not allow the use of one key on multiple
repositories.

One small drawback is that there's not really a way to specify this
directly to git with the way the helper function works, so it just tries
them all until it succeeds.

Here's a demo repository for states, including links to protected
repositories, and their keys:
https://github.com/scoates/salt-multi-identity-git-states
Set proper fallback CONFIG_DIR for NetBSD

This is not a critical fix since the official package for NetBSD uses
--salt-config-dir to set the config dir. But, since NetBSD uses pkgsrc,
which defaults to /usr/pkg/etc, a NetBSD-specific fallback should be
set.

See https://github.com/saltstack/salt/issues/11889#issuecomment-40500747
for more information.
Fix os grains for OpenSolaris/OpenIndiana Development

The lack of a space in the OS grain breaks os_family resolution.

Fixes #11907
Adds --show-jid to print the jid without the additional output of --verbose
Adds -sj as shortened version of --show-jid
Removes broken -sj short option
Adds show_jid option to master config
Simple pyline whitespace fix
Add LDAP uri option and fix deficiencies
Fixed pylint C0326 issue
new download functions and other improvements
fixed pylint errors
Merge pull request #1 from saltstack/develop

Pull in latest upstream.
Find key file via profile config on destroy the same way it is found on create.
Merge pull request #12004 from ticosax/fix-variable-scope

Fix variable definition in wrong scope