fix the stop server issue.
Merge remote-tracking branch 'origin/master'
fix server status display error.