CA-394882,CA-394883: Fix task server race condition, and testcase race condition#5737

edwintorok merged 2 commits intoxapi-project:masterxapi-project/xen-api:masterfrom

edwintorok:private/edvint/taskbugfixedwintorok/xen-api:private/edvint/taskbugfixCopy head branch name to clipboard