Merge "Special-case "su --help"."