fix `pomelo stop/kill` bug

Change-Id: I1fc252c81cb0bc1a29e9174b7a7148b8799d3343
Merge branch 'master' of ssh://pomelo.com:29418/pomelo