Added awaitTermination to ActorSupport - in some cases, we have a race condition where shutdown code wasn't being called before services were restarted.