Merge branch '4.5.0' of https://github.com/adaptivecomputing/torque into 4.5.0

Author: Elizabeth Chan

src/lib/Libifl/tm.c

@@ -1387,7 +1387,8 @@ tm_register(tm_whattodo_t *what, tm_event_t *event)
   return TM_ENOTIMPLEMENTED;
   }
 
-#define FOREVER 2592000
+#define FOREVER              2592000
+#define INITIALPOLLTIMEOUT   5
 
 /*
 ** tm_poll - poll to see if an event has been completed.
@@ -1478,7 +1479,7 @@ int tm_poll(
   ** Setup tcp dis routines with a wait value appropriate for
   ** the value of wait the user set.
   */
-  pbs_tcp_timeout = wait ? FOREVER : 1;
+  pbs_tcp_timeout = wait ? INITIALPOLLTIMEOUT : 1;
 
   prot = disrsi(static_chan, &ret);