Merge "Prevent ssh hang during shutdown"