Fix shutdown deadlock when bootstrapping slaves + more log on slave errors