REQ-403 concurrency fixes part 1#4441

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

lippirk:lockslippirk/xen-api:locksCopy head branch name to clipboard