Also check to see if infrastructre flag was previously set before assuming it to be false. This was causing orterun to operate incorrectly in the presence of a persistant daemon. This commit was SVN r7039.