Make sure multiple git pillar sources work

Skip tests if no internet connection
Update pillar unit test
Remove deps on unavailable code
Merge pull request #15091 from pass-by-value/git_pillar_port_2

Git pillar port 2
Merge pull request #15208 from s0undt3ch/hotfix/bootstrap-script-2014.1

[2014.1] Update to latest bootstrap script, v2014.08.23
Fix broken core grains detection in localclient

A stacktrace was being thrown and swallowed in the core os detection
because there was no __file__ attribute when run via localclient.

Refs #13920
Lint
Remove compound matching from jenkins.py

Conflicts:
	tests/jenkins.py
put -C tar command back in
Pylint fix
Add mako deprecation warning
Merge pull request #15260 from rallytime/pylint_fix

Pylint fix
Documented JSON outputter config options and fixed 'null' case
Backport #15317 to 2014.1
Merge pull request #15322 from s0undt3ch/2014.1

Backport #15317 to 2014.1
Fix typo
Continue if master in multi-master is down
Guh. Typoed earlier and forgot to remove.
Fix error message for missing include

This fixes an error where the wrong SLS target would be reported as
missing, when a missing include was encountered.

This is fixed upstream already, this commit just brings the relevant
part of the fix to the 2014.1 branch.
Merge pull request #15333 from basepi/bp-14904

Backport #14904 and #14929 to 2014.1