change variable name

Change-Id: I2802ca2d31f98c4a6b02d8d8e51890d2eeaa95c4
Merge "change variable name" into 0.3.x
Merge branch '0.3.x' of ssh://pomelo.163.com:29418/pomelo into 0.3.x
add handshake ack and fix handshake bugs

Change-Id: I7b319a6e95ceb9d893a734f41cd6219d232575e5
Merge "add handshake ack and fix handshake bugs" into 0.3.x
Merge branch '0.3.x' of ssh://pomelo.163.com:29418/pomelo into 0.3.x
Merge "Merge branch '0.3.x' of ssh://pomelo.163.com:29418/pomelo into 0.3.x"
Merge "Merge branch '0.3.x' of ssh://pomelo.163.com:29418/pomelo into 0.3.x"