This diff updates the keyserver function that handles user avatar assignment to assign based on the new user_container column. We still check the old container column to make sure that the upload in question has not already been assigned.
Depends on D11986