Properly preserve /etc/mail during upgrades.
Properly preserve /etc/mail during upgrades.

PR:		misc/23048
Submitted by:	jack@germanium.xtalwind.net

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase