Record r340273, r340275, r340295, r340303 as merged.

These commits where the result of running "make sysent" and their
counterparts in this branch were direct commits.