Fix build issues from alarms merge
Merge pull request #27 from Metaswitch/alarm-merge

[No reviewer] Fix build issues from alarms merge