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

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