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
Since docker is using multiple driver extend its attach support.

Add support for attaching processes to a container driven by libcontainer.
lxc is still supported.
Merge pull request #12009 from fictivekin/allow-multiple-git-ids

Allow multiple identities for git
Merge pull request #12014 from terminalmage/netbsd-syspaths

Set proper fallback CONFIG_DIR for NetBSD
Merge pull request #12019 from terminalmage/issue11907

Fix os grains for OpenSolaris/OpenIndiana Development
Merge pull request #12026 from iquaba/show-jid

--show-jid
Merge pull request #12035 from jeroennijhof/develop

Add LDAP uri option and fix deficiencies
Merge pull request #12036 from southquist/improved-softwareupdate

new download functions and other improvements
Merge pull request #12038 from ticosax/add-support-multi-docker-engine

Since docker is using multiple driver extend its attach support.