Make WorkflowService timeout configurable
Merge for 4.6.5 release