Minor fixes for the new ft-common lib
Merge branch 'master' of https://github.com/Freetable/network-services