Partially revert 06cd326e and change pkg.conf.5 to reference /etc/pkg.

This was already done to check /etc/pkg