Merge \"Made severe and extreme alert configuration dependency configurable\" into nyc-mr1-dev
am: 338566df68

Change-Id: I90c0669c74e15d92d00a639ad444866142a62c2e