Add salt.utils.master with class MasterPillarUtil. Change salt.runners.cache to use salt.utils.master.MasterPillarUtil
removed else clause on SUB_EVENT processing
Fix removed else clause. Tom saw no reason to have it
<<<<<<< HEAD
=======
            else:
                            self.fire_event(load, load['fun'])  # old dup event
                                            self.fire_event(load,
                                                                            tagify([load['jid'],
                                                                                                                    'sub',
                                                                                                                                                            load['id'],
                                                                                                                                                                                                    'ret',
                                                                                                                                                                                                                                            load['fun']],
                                                                                                                                                                                                                                                                                   'job'))
                                                                                                                                                                                                                                                                                   >>>>>>> upstream/develop

Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	salt/utils/event.py
Merge pull request #6900 from SmithSamuelM/develop

Removed else clause in handling of SUB_EVENTS. According to Tom it served no purpose.
Merge pull request #6897 from s0undt3ch/features/salttesting-mock

Use salttesting.mock which allows for cleaner tests skip if mock is not available.
Fix error when gitfs file hash does not yet exist

This repeats the fix done in 46d58dc for the gitfs backend.
Fix exception while fetching new gitfs remotes

This fixes a bug caused by one of GitPython's innumerable asserts failing
upon fetching a new remote, causing an exception which interrupts the
fileserver update.
Merge pull request #6901 from terminalmage/gitfs-fixes

Gitfs fixes
Merge pull request #6838 from dlanderson/master_util

Add salt.utils.master with class MasterPillarUtil. Change salt.runners.c...
Allow tests to be properly skipped if `mock` is not installed.
Fix test expected output plus an additional one for pip git install.