Fix conflict and sync openapi.yaml.j2 with openapi.yaml.
Fix conflict and sync openapi.yaml.j2 with openapi.yaml.

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