Merge pull request #225 from qiangdavidliu/2.x

Changing default port numbers yet again
Add server side servo metrics.
Merge remote-tracking branch 'remotes/netflix/2.x' into 2.x
Merge pull request #226 from tbak/2.x

2.x Add server side servo metrics.
Adjust metric names to be more readable in the monitoring system.
Merge pull request #227 from tbak/2.x

2.x Adjust metric names to be more readable in the monitoring system.