Merge "Fix share server migration tests"