STORM-245: implement Stream.localOrShuffle() for trident
Merge branch 'trident-local-or-shuffle' of https://github.com/ptgoetz/incubator-storm into STORM-245

STORM-245: implement Stream.localOrShuffle() for trident
Added STORM-245 to Changelog