Merge "Change ContrailXMPPSessionsNone and ContrailXMPPSessionsNoneUp alerts"