- align file locations to match new upstream config - amend messages and UPDATING to alert users - use upstream sample files for default configuration - MAINTAINER timeout Approved by: jrm (mentor) Differential Revision: https://reviews.freebsd.org/D20021