fix master ha bugs
Merge branch '0.5.x' of ssh://pomelo.com:29418/pomelo into 0.5.x
fix conflict