OOIION-1527: Agent restart for non-system restart case