Merge "Remove deprecated server-name variable"