Revert to 'zpool import -a'

It turns out 'zpool import -c /etc/zfs/zpool.cache -a' currently
only will do a verbatim import, not handling renumbered disks, so
for now we'll need to rely on 'zpool import -a'.