Rebase to relead-60
Merge pull request #108 from ClearwaterCore/CC_alarms-60

SNMP Alarms Release-60