Fix alarm definitions
Merge branch 'memento-alarms' of github.com:Metaswitch/cpp-common into memento-alarms