Upstream: More removals or explanations of --libexecdir, and associated fixes.
Upstream: reinstate --libexecdir= in sudo (it only contains libraries)