Fix metric labels in default metrics layout (@justinvdm).
Merge branch 'develop' of github.com:praekelt/vumi-go into develop