Merge "Nuke all reference to /etc/ethers"