MFC revision 1.4: Add /boot/devices.hints to the default list of files which have local modifications merged during upgrading.
MFC revision 1.4: Add /boot/devices.hints to the default list of files
which have local modifications merged during upgrading.

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