Resolved conflict, added changes in CHANGELOG.rst
Resolved conflict, added changes in CHANGELOG.rst

Plexxi/st2,nzlosh/st2,StackStorm/st2,StackStorm/st2,nzlosh/st2,nzlosh/st2,Plexxi/st2,StackStorm/st2,Plexxi/st2,StackStorm/st2,nzlosh/st2,Plexxi/st2