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.