Merge snamp-alarms changes