HBASE-7484 Fix Restore with schema changes