Merge pull request #1181 from danmcp/master

Merged by openshift-bot
set timeout to disc timeout for direct addressing