Undo a change not relevant to bug25191
Do not catch all exceptions when clearing resources
Pull up methods related to alarms
Use overlapping alarms in c.r.c.test.server.BlockedConnection

Per suggestion in #25191