Don't halt on failed rename zfs commands during restore, sometimes
user has zvols which don't need this
Merge remote-tracking branch 'upstream/master'