LIVEOAK-463: Initial timeout support added for scripting
Merge pull request #332 from mwringe/LIVEOAK-463

LIVEOAK-463: Initial timeout support added for scripting