Merge "Follow-up to I05aacd30b: normalize case in User::idFromName"