Bugfix for cluster location score calculation

Location score was updated incorrectly during the ReplaceAndFailover
move. Now it is corrected.

Signed-off-by: Oleg Ponomarev <onponomarev@gmail.com>
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>