Reviewed-by: alanb, darcy, naoto

Reviewed-by: darcy, weijun

Summary: allow shutdown hook to be added during shutdown and handle properly if it fails to add
Reviewed-by: alanb, dholmes, martin