BZ 1130341 - Agent can be stuck waiting for startup