Merge "Rename Longterm PSDS server flags"