Incorporate review comments
Merge branch 'snmp-alarms-58' of github.com:ClearwaterCore/memento into snmp-alarms-58