Send ChildTerminated before Terminated when AddressTerminated, see #2983

* Replaces the previous half-baked removeChildWhenToAddressTerminated