Full Issue 2094 Fix

An additional test script to ensure 'zpool import' regressions are caught prior to those changes being merged.