Add varstack ext_pillar
Fix pylint complaints
Add a "base" dictionary argument to grains:filter_by()

The base argument provides a base dictionary for default settings.
The grain-selected look_up dictionary is then merged over the top of
base followed by the merge dictionary being merged.  The base allows
for common settings in each of the look_up groups to be collected into
the base so that they do not have to be repeated for each group.

example1:

  salt '*' grains.filter_by '{A: {B: Z}, C: {D: {E: F,G: H}}}' 'xxx' '{D: {E: I},J: K}' 'C' '{D: {E: X}, L: M}'

result1:

  {D: {E: I, G: H}, J: K, L: M}

example2:

  The same as example1 but with default selector 'A' rather than 'C'.

result2:

  {B: Z, D: {E: I}, J: K, L: M}
Test long jid passed on CLI
Pylint fix
Send correct tgt_type

Fixes #16783
Be safe about removing minion ids

Closes #16782
based on the excellent work by Anita Krueger <anita@steponeinc.com>, initially adding a returner for hipchat.
Merge pull request #16789 from cachedout/issue_16783

Send correct tgt_type
Merge pull request #16791 from cachedout/issue_16782

Be safe about removing minion ids
BUG: fixes a bug where the check for versions numbers fails to work for versions a.b where b>=10
TST: Updated mac_user tests for modifications to OS release handling
Avoid key error in connected_ids()

Continue through the loop if we could't access the grains instead of
crashing and burning.

Closes #15143
Merge pull request #16796 from rallytime/bp-16704

Backport #16704 to 2014.7
Merge pull request #16769 from rallytime/jid_str_test

Test long jid passed on CLI
Add PID to default logfile format string

Resolves #11346.
Merge branch '2014.7' into develop

Conflicts:
	salt/utils/minions.py
Merge pull request #16767 from plastikos/develop

Add a "base" dictionary argument to grains:filter_by()
Merge pull request #16748 from conversis/varstack-ext-pillar

Add varstack ext_pillar
Merge pull request #16798 from cachedout/issue_15143

Avoid key error in connected_ids()