6362672 import gets confused about overlapping slices

[eric.schr...@sun.com]

Author: eschrock
Repository: /hg/onnv/onnv-gate
Revision: 480771a321a455eeac2c273d3eddc6683ef5a5ca
Log message:
6362672 import gets confused about overlapping slices
6364582 need to fixup paths if they've changed

Files:
        update: usr/src/cmd/truss/codes.c
        update: usr/src/cmd/zpool/zpool_main.c
        update: usr/src/cmd/zpool/zpool_util.c
        update: usr/src/cmd/zpool/zpool_util.h
        update: usr/src/lib/libzfs/common/libzfs.h
        update: usr/src/lib/libzfs/common/libzfs_import.c
        update: usr/src/lib/libzfs/common/libzfs_pool.c
        update: usr/src/lib/libzfs/spec/libzfs.spec
        update: usr/src/uts/common/fs/zfs/spa.c
        update: usr/src/uts/common/fs/zfs/sys/spa.h
        update: usr/src/uts/common/fs/zfs/zfs_ioctl.c
        update: usr/src/uts/common/sys/fs/zfs.h