CA-105155: Make sure we really timeout as requested
CA-105155: Make sure we really timeout as requested

Signed-off-by: Jon Ludlam <e7e3380887a8f95cc9dc4f0d51dedc7e849a287a@eu.citrix.com>

djs55/xenopsd-previous,johnelse/xenopsd,euanh/xenopsd,simonjbeaumont/xenopsd,thomassa/xenopsd,simonjbeaumont/xenopsd,johnelse/xenopsd,koushikcgit/xenopsd,koushikcgit/xenopsd,johnelse/xenopsd,cheng--zhang/xenopsd,cheng--zhang/xenopsd,djs55/xenopsd-previous,cheng--zhang/xenopsd,euanh/xenopsd,thomassa/xenopsd,koushikcgit/xenopsd,djs55/xenopsd,djs55/xenopsd,euanh/xenopsd,simonjbeaumont/xenopsd,thomassa/xenopsd,djs55/xenopsd-previous,djs55/xenopsd