WELD-1657 Backport WELD-1452
WELD-1315 Don't try to restore the long-running conversation if cid
param is empty
Fix ConversationTimeoutTest to show test failures instead of test errors
Make ConversationTimeoutTest more robust