OOIION-1527: Agent restart for non-system restart case
Merge pull request #425 from mmeisinger/fix1527_agent_m

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