Style/etc cleanup in server.
Remove dead typedef.
Merge lp:~tangent-org/gearmand/1.2-build/ Build: jenkins-Gearmand-386