Remove the two alarm types and add a generic type for critical state
Remove the two alarm types and add a generic type for critical state

Second attempt through pull request.
openconfig/hercules,openconfig/hercules