Check descriptor ID in addition to HS ID when saving a v2 hs descriptor

Fixes bug 13214; reported by 'special'.
Merge remote-tracking branch 'public/bug13214_025_squashed'