Fix update of share with share-server-id

If for some reason share server was not created and fell to 'ERROR' state, then
share will not get share-server-id. We should know what server was expected
to be used with each share.

Change-Id: I967a48481b79c9e80eb57806fc103704db209bb4
Closes-Bug: #1352424
Merge "Fix update of share with share-server-id"