Update to r54184:

Replace the manual fetch method with bsdinstall and break the methods
into separate sections.