Merge "Fix generic handling of NameAlreadyUsedException in GerritCallback"